public/images/icons/ajax-loader.gif @@ -59,7 +59,7 @@ class MessagesController < ApplicationController def create - if params["commit"] == "Send to all" and current_person.admin? + if params["all_people"] and current_person.admin? # Send messages to all (active) people. messages = Person.all_active.inject([]) do |messages, person| message = Message.new(params[:message].merge(:sender => current_person, @@ -119,6 +119,15 @@ class MessagesController < ApplicationController format.html { redirect_to messages_url } end end + + def preview + render :update do |page| + page['preview_area']. + replace_html(display(params[:message][:content])). + visual_effect :blind_down + page['message_submit'].activate + end + end private app/controllers/messages_controller.rb @@ -2,7 +2,7 @@ class PeopleController < ApplicationController skip_before_filter :require_activation, :only => :verify skip_before_filter :admin_warning, :only => [ :show, :update ] - before_filter :login_required, :only => [ :show, :edit, :update ] + before_filter :login_required, :only => [ :show, :edit, :update, :preview ] before_filter :correct_user_required, :only => [ :edit, :update ] before_filter :setup @@ -93,9 +93,15 @@ class PeopleController < ApplicationController flash[:success] = 'Profile updated!' format.html { redirect_to(@person) } else - if preview? - @preview = @person.description = params[:person][:description] - end + #if preview? + # @preview = @person.description = params[:person][:description] + #end + format.js { + render :update do |page| + page.replace_html 'preview_area', display(params[:person][:description]) + page.visual_effect :highlight + end + } format.html { render :action => "edit" } end when 'password_edit' @@ -113,6 +119,16 @@ class PeopleController < ApplicationController end end + def preview + sleep 3 + raise "fuck" + render :update do |page| + page['preview_area']. + replace_html(display(params[:person][:description])). + visual_effect :blind_down + end + end + def common_contacts @person = Person.find(params[:id]) @common_connections = @person.common_connections_with(current_person, @@ -129,10 +145,11 @@ class PeopleController < ApplicationController end def correct_user_required + logger.info params.inspect redirect_to home_url unless Person.find(params[:id]) == current_person end def preview? - params["commit"] == "Preview" + params["preview"] end end app/controllers/people_controller.rb @@ -32,7 +32,7 @@ class PhotosController < ApplicationController flash[:error] = "Your browser doesn't appear to support file uploading" redirect_to edit_person_url(current_person) and return end - if params[:commit] == "Cancel" + if params[:cancel] redirect_to edit_person_url(current_person) and return end person_data = { :person => current_person, app/controllers/photos_controller.rb @@ -53,6 +53,15 @@ class PostsController < ApplicationController end end end + + def preview + render :update do |page| + page['preview_area']. + replace_html(display(params[:post][:body])). + visual_effect :blind_down + page['post_submit'].activate + end + end def update respond_to do |format| app/controllers/posts_controller.rb @@ -55,13 +55,21 @@ <br /> <div class="form_row"> + <div id="preview_area"></div> <label for="about">About</label> <br /> <p><%= formatting_note %></p> <%= f.text_area :about, :rows => 10 %> </div> - + <br /> + + <div class="form_row"> + <%= submit_to_remote 'preview_btn', 'Preview', + :url => { :action => 'preview' }, + :html => { :class => 'button', :id => 'preview' } %> + </div> + <br /> <div class="form_row"> @@ -71,7 +79,7 @@ </div> <div class="form_row"> - <%= f.submit "Update", :class => "button" %> + <%= f.submit "Update", :class => "button" %> </div> or <%= link_to "Cancel", admin_preferences_path %> <% end %> app/views/admin/preferences/edit.html.erb @@ -8,6 +8,8 @@ <%= javascript_include_tag :defaults %> </head> <body class="<%= @body %>"> + <div id="loaging_area"><%= image_tag('icons/ajax-loader.gif', :alt => "Loading...") %> Loading...</div> + <div id="error_area">Error</div> <div id="header-wrap"> <div id="header"> <h1> app/views/layouts/application.html.erb @@ -2,6 +2,8 @@ <%- column_div :type => :primary do -%> + <div id="preview_area"></div> + <p><%= formatting_note %></p> <%= error_messages_for :message %> @@ -39,10 +41,13 @@ </div> <div class="form_row"> <%= f.submit "Send!", :class => "button", :id => "message_submit" %> + <%= submit_to_remote 'preview_btn', 'Preview', + :url => { :action => 'preview' }, + :html => { :class => 'button', :id => 'preview' } %> <%= f.submit "Preview", :class => "button", :id => "preview" %> <%= f.submit "Cancel", :class => "button", :id => "cancel" %> <%- if current_person?(@recipient) and current_person.admin? -%> - <%= f.submit "Send to all", :class => "button", :id => "all_people" %> + <%= f.submit "Send to all", :class => "button", :id => "all_people", :name => "all_people" %> <%- end -%> </div> <% end %> app/views/messages/new.html.erb @@ -1,150 +1,161 @@ -<%- column_div :type => :primary do -%> - <h2>Edit profile</h2> - - <div id="profile_edit"> - - <h3>Personal details</h3> - - <%= error_messages_for :person %> - - <% form_for @person do |f| %> - - <div class="form_row"> - <label for="person_name">Name</label> - <%= f.text_field :name, :maxlength => Person::MAX_NAME %> - </div> - - <div class="form_row"> - <label for="person_description">Description - </label> - - <%- unless @preview.nil? -%> - <%= display @preview %> - <%- end -%> - - <p><%= formatting_note %></p> - <%= f.text_area :description %> - </div> - - <div class="form_row"> - <label for="person_email">Email</label> - <%= f.text_field :email, :maxlength => Person::MAX_EMAIL %> - </div> - - <%- if global_prefs.email_notifications? -%> - - <br /> - - <h3>Email notification preferences</h3> - - <p> - You will receive email notifications - for each event type whose box is checked. - </p> - - - <div class="form_row"> - <p> - <label for="connection_notifications" - class="checkbox">Connections:</label> - <%= f.check_box :connection_notifications %> - </p> - <p> - <label for="message_notifications" - class="checkbox">Messages:</label> - <%= f.check_box :message_notifications %> - </p> - <p> - <label for="wall_comment_notifications" - class="checkbox">Wall comments:</label> - <%= f.check_box :wall_comment_notifications %> - </p> - <p> - <label for="blog_comment_notifications" - class="checkbox">Blog comments:</label> - <%= f.check_box :blog_comment_notifications %> - </p> - </div> - <%- end -%> - - <br /> - - <div class="form_row"> - <%= f.submit "Update", :class => "button" %> - <%= f.submit "Preview", :id => "preview", :class => "button" %> - </div> - <input type="hidden" name="type" value="info_edit" /> - <% end %> - - <br /> - - <h3>Photos</h3> - - <% if @person.photos.empty? %> - <%= image_tag @person.thumbnail %> - <% else %> - <table> - <% @person.sorted_photos.collect_every(N_COLUMNS) do |row| %> - <tr> - <% row.each do |photo| %> - <td style="padding-left: 1em;"> - <%= image_tag photo.public_filename(:thumbnail) %> - </td> - <% end %> - </tr> - <tr> - <% row.each do |photo| %> - <td style="padding-left: 1em;"> - <% if photo.primary? %> - primary - <% else %> - <%= link_to "select", photo_path(photo), - :method => :put %> - <% end %> - | - <%= link_to image_tag("icons/close.gif"), photo_path(photo), - :method => :delete %> - </td> - <% end %> - </tr> - <% end %> - </table> - <% end %> - <br /> - <%= button_to "Add a photo", new_photo_path, :class => "button" %> - </div> - - <br /> - - <% form_for @person, :html => { :id => "change_password" } do |f| %> - - <h3>Change Password</h3> - - <div class="form_row"> - <label for="password">Current Password</label> - <%= f.password_field :verify_password, - :maxlength => Person::MAX_PASSWORD %> - </div> - - <div class="form_row"> - <label for="password">New Password</label> - <%= f.password_field :new_password, - :maxlength => Person::MAX_PASSWORD %> - </div> - - <div class="form_row"> - <label for="password_confirmation">Confirm Password</label> - <%= f.password_field :password_confirmation, - :maxlength => Person::MAX_PASSWORD, - :value => "" %> - </div> - <div class="form_row"> - <%= submit_tag 'Change password', :class => "button" %> - </div> - <input type="hidden" name="type" value="password_edit" /> - <% end %> -<%- end -%> - -<%- column_div :type => :secondary do -%> - <%= render :partial => 'searches/box' %> -<%- end -%> \ No newline at end of file +<%- column_div :type => :primary do -%> + <h2>Edit profile</h2> + + <div id="profile_edit"> + + <h3>Personal details</h3> + + <%= error_messages_for :person %> + + <% form_for @person do |f| %> + + <div class="form_row"> + <label for="person_name">Name</label> + <%= f.text_field :name, :maxlength => Person::MAX_NAME %> + </div> + + <div class="form_row"> + <label for="person_description">Description + </label> + + <div id="preview_area"></div> + + <p><%= formatting_note %></p> + <%= f.text_area :description %> + </div> + + <div class="form_row"> + <label for="person_email">Email</label> + <%= f.text_field :email, :maxlength => Person::MAX_EMAIL %> + </div> + + <%- if global_prefs.email_notifications? -%> + + <br /> + + <h3>Email notification preferences</h3> + + <p> + You will receive email notifications + for each event type whose box is checked. + </p> + + + <div class="form_row"> + <p> + <label for="connection_notifications" + class="checkbox">Connections:</label> + <%= f.check_box :connection_notifications %> + </p> + <p> + <label for="message_notifications" + class="checkbox">Messages:</label> + <%= f.check_box :message_notifications %> + </p> + <p> + <label for="wall_comment_notifications" + class="checkbox">Wall comments:</label> + <%= f.check_box :wall_comment_notifications %> + </p> + <p> + <label for="blog_comment_notifications" + class="checkbox">Blog comments:</label> + <%= f.check_box :blog_comment_notifications %> + </p> + </div> + <%- end -%> + + <br /> + + <div class="form_row"> + <%= f.submit "Update", :class => "button" %> + <% + update = {} + failure = "" + if development? + update[:failure] = "content" + else + failure = "$('error_area').style.display = 'inline';" + end + %> + <%= submit_to_remote 'preview_btn', 'Preview', + :url => { :action => 'preview', :id => @person }, + :html => { :class => 'button', :id => 'preview' }, + :update => update, + :failure => failure %> + </div> + <input type="hidden" name="type" value="info_edit" /> + <% end %> + + <br /> + + <h3>Photos</h3> + + <% if @person.photos.empty? %> + <%= image_tag @person.thumbnail %> + <% else %> + <table> + <% @person.sorted_photos.collect_every(N_COLUMNS) do |row| %> + <tr> + <% row.each do |photo| %> + <td style="padding-left: 1em;"> + <%= image_tag photo.public_filename(:thumbnail) %> + </td> + <% end %> + </tr> + <tr> + <% row.each do |photo| %> + <td style="padding-left: 1em;"> + <% if photo.primary? %> + primary + <% else %> + <%= link_to "select", photo_path(photo), + :method => :put %> + <% end %> + | + <%= link_to image_tag("icons/close.gif"), photo_path(photo), + :method => :delete %> + </td> + <% end %> + </tr> + <% end %> + </table> + <% end %> + <br /> + <%= button_to "Add a photo", new_photo_path, :class => "button" %> + </div> + + <br /> + + <% form_for @person, :html => { :id => "change_password" } do |f| %> + + <h3>Change Password</h3> + + <div class="form_row"> + <label for="password">Current Password</label> + <%= f.password_field :verify_password, + :maxlength => Person::MAX_PASSWORD %> + </div> + + <div class="form_row"> + <label for="password">New Password</label> + <%= f.password_field :new_password, + :maxlength => Person::MAX_PASSWORD %> + </div> + + <div class="form_row"> + <label for="password_confirmation">Confirm Password</label> + <%= f.password_field :password_confirmation, + :maxlength => Person::MAX_PASSWORD, + :value => "" %> + </div> + <div class="form_row"> + <%= submit_tag 'Change password', :class => "button" %> + </div> + <input type="hidden" name="type" value="password_edit" /> + <% end %> +<%- end -%> + +<%- column_div :type => :secondary do -%> + <%= render :partial => 'searches/box' %> +<%- end -%> app/views/people/edit.html.erb @@ -8,6 +8,6 @@ </div> <div class="form_field"> <%= submit_tag 'Update' %> - <%= f.submit "Cancel", :id => "cancel" %> + <%= f.submit "Cancel", :id => "cancel", :name => "cancel" %> </div> -<% end -%> \ No newline at end of file +<% end -%> app/views/photos/edit.html.erb @@ -9,6 +9,6 @@ </div> <div class="form_field"> <%= submit_tag 'Upload', :class => "button" %> - <%= f.submit "Cancel", :id => "cancel", :class => "button" %> + <%= f.submit "Cancel", :id => "cancel", :class => "button", :name => "Cancel" %> </div> -<% end -%> \ No newline at end of file +<% end -%> app/views/photos/new.html.erb @@ -7,6 +7,8 @@ <h3>Add new post</h3> + <div id="preview_area"></div> + <p><%= formatting_note %></p> <%= error_messages_for :post %> @@ -19,6 +21,9 @@ <div class="form_row"> <%= f.submit "Submit", :class => "button" %> + <%= submit_to_remote 'preview_btn', 'Preview', + :url => { :controller => 'posts', :action => 'preview', :forum_id => @forum, :topic_id => @topic }, + :html => { :class => 'button', :id => 'preview' } %> </div> <% end %> app/views/topics/show.html.erb @@ -4,12 +4,12 @@ # pid_file: location of the server's pid file (relative to RAILS_ROOT) # log_file: log file (default: RAILS_ROOT/log/ferret_server.log # log_level: log level for the server's logger -production: - host: localhost - port: 9010 - pid_file: log/ferret.pid - log_file: log/ferret_server.log - log_level: warn +#production: + #host: localhost + #port: 9010 + #pid_file: log/ferret.pid + #log_file: log/ferret_server.log + #log_level: warn # aaf won't try to use the DRb server in environments that are not # configured here. config/ferret_server.yml @@ -1,2 +1,14 @@ -// Place your application-specific JavaScript functions and classes here -// This file is automatically included by javascript_include_tag :defaults + +// Generic callbacks that work across all Ajax requests +Ajax.Responders.register({ + onCreate: function() { + if (Ajax.activeRequestCount === 1) { + $('loaging_area').style.display = 'inline'; + } + }, + onComplete: function() { + if (Ajax.activeRequestCount === 0) { + $('loaging_area').hide(); + } + } +}); public/javascripts/application.js @@ -316,4 +316,40 @@ strong { font-weight: bold; } .loud { color: #000; } .highlight { background:#ff0; } .added { background:#060; color: #fff; } -.removed { background:#900; color: #fff; } \ No newline at end of file +.removed { background:#900; color: #fff; } + +#loaging_area { + background-color:#FFF6BF; + border-color:#FFD324; + color:#514721; + border-width: 0 2px 2px 2px; + border-style: solid; + + padding: 0.1em 0.5em 0.1em 0.5em; + + left:50%; + margin-left:-26px; + position:fixed; + top:0pt; + z-index:10000; + + display:none; +} + +#error_area { + background:#FBE3E4 none repeat scroll 0% 0%; + border-color:#FBC2C4; + color:#8A1F11; + border-width: 0 2px 2px 2px; + border-style: solid; + + padding: 0.1em 0.5em 0.1em 0.5em; + + left:50%; + margin-left:-26px; + position:fixed; + top:0pt; + z-index:10001; + + display:none; +} \ No newline at end of file public/stylesheets/typography.css @@ -78,7 +78,7 @@ describe MessagesController do post :create, :message => { :subject => "The subject", :content => "Hey there!" }, :person_id => @other_person, - :commit => "Send to all" + :all_people => "Send to all" end.should change(Message, :count).by(Person.active.length) end @@ -137,4 +137,4 @@ describe MessagesController do assigns(:message).should be_reply end.should change(Message, :count).by(1) end -end \ No newline at end of file +end spec/controllers/messages_controller_spec.rb @@ -57,7 +57,7 @@ describe PhotosController do end it "should handle cancellation and doesn't report about problem" do - post :create, :commit => "Cancel", :photo => { :uploaded_data => nil } + post :create, :cancel => "Cancel", :photo => { :uploaded_data => nil } response.should redirect_to(edit_person_url(@person)) flash[:error].should be_nil end spec/controllers/photos_controller_spec.rb 264ae4e53753ec705ed3dc68cb615c8dc4ef9db6 93da5b953a8072255c029acea3f812fad13796c3 Pavel Valodzka pavel@valodzka.name http://github.com/valodzka/insoshi/commit/0e29f505c4c978efa533d91fb16c79c96cb1f74f 0e29f505c4c978efa533d91fb16c79c96cb1f74f

2008-05-23T15:32:34-07:00

Merge branch 'valodzka' of git@github.com:valodzka/insoshi into valodzka Conflicts: app/views/people/edit.html.erb cc9572b251b8afafc4d792da48bc470d1aa6b9c7 Pavel Valodzka pavel@valodzka.name