[Logilogi-svn] SF.net SVN: logilogi:[1567] trunk

Revision: 1567
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1567&view=rev
Author:   wybow
Date:     2009-09-06 11:28:43 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
Fixed cancel bug, improved descr of tags link

Modified Paths:
--------------
    trunk/app/helpers/application_helper.rb
    trunk/app/views/application/_submit.html.erb
    trunk/app/views/comments/_new.html.erb
    trunk/app/views/external_links/edit.html.erb
    trunk/app/views/invitations/edit.html.erb
    trunk/app/views/invitations/new.html.erb
    trunk/app/views/links/edit.html.erb
    trunk/app/views/logi_inserts/new.html.erb
    trunk/app/views/logi_settings/edit.html.erb
    trunk/app/views/logis/_edit_with_tags.html.erb
    trunk/app/views/logis/_remarks.html.erb
    trunk/app/views/password_resets/edit.html.erb
    trunk/app/views/password_resets/new.html.erb
    trunk/app/views/peer_groups/edit.html.erb
    trunk/app/views/peer_groups/new.html.erb
    trunk/app/views/remarks/edit.html.erb
    trunk/app/views/searches/_navigation_bar_search_header.html.erb
    trunk/app/views/user_sessions/_method.html.erb
    trunk/app/views/users/_method.html.erb
    trunk/app/views/users/edit.html.erb
    trunk/lib/logi_form_builder.rb

Modified: trunk/app/helpers/application_helper.rb
===================================================================
--- trunk/app/helpers/application_helper.rb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/helpers/application_helper.rb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -141,7 +141,7 @@
             {:text => _("Insert"), :name => "edit_insert",
                 :url => new_logi_logi_inserts_url(logi),
                 :description => _("Currently inserting into logi")},
-            {:text => _("Remove"), :name => "edit_remove",
+            {:text => _("Take out"), :name => "edit_remove",
                 :url => edit_logi_remarks_url(logi),
                 :description => _("Currently removing from logi")},
             {:text => _("Settings"), :name => "edit_settings",
@@ -587,9 +587,10 @@
     end
   end
 
-  def cancel_button(text = nil)
-    text ||= _("Cancel")
-    button_to text, self.return_url_or_default, :class => 'cancel_button'
+  def cancel_button(options = {})
+    options[:text] ||= _("Cancel")
+    options[:url] ||= self.return_url_or_default
+    button_to options[:text], options[:url], :class => 'cancel_button'
   end
 
   def back_button(text = nil)

Modified: trunk/app/views/application/_submit.html.erb
===================================================================
--- trunk/app/views/application/_submit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/application/_submit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -1,4 +1,5 @@
 <% render :layout => 'application/panel', :locals => {:id => "submit"} do %>
   <label><%= _('Submit') %></label>
   <%= form.submit _('Submit') %>
+  <%= cancel_buttoni :url => local_assigns[:cancel_url] %>
 <% end %>

Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/comments/_new.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -33,6 +33,7 @@
   <% render :layout => 'application/panel', :locals => {:id => "submit"} do %>
     <label><%= _('Submit') %></label>
     <%= form.submit _('Submit'), : "$('logi_form').submit()" %>
+    <%= cancel_button :url => logi_url(@logi) %>
   <% end %>
 <% end %>
 

Modified: trunk/app/views/external_links/edit.html.erb
===================================================================
--- trunk/app/views/external_links/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/external_links/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -56,6 +56,7 @@
   <div class="spacer"></div>
 
   <div class="main_column">
-    <%= render :partial => 'application/submit', :locals => {:form => form} %>
+    <%= render :partial => 'application/submit', :locals => {:form => form,
+        :cancel_url => logi_url(@logi)} %>
   </div>
 <% end %>

Modified: trunk/app/views/invitations/edit.html.erb
===================================================================
--- trunk/app/views/invitations/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/invitations/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -21,6 +21,7 @@
           <p>Accept your invitation</p>
         <% end %>
         <%= f.submit "Accept" %>
+        <%= cancel_button %>
       <% end %>
     <% end %>
   <% else %>

Modified: trunk/app/views/invitations/new.html.erb
===================================================================
--- trunk/app/views/invitations/new.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/invitations/new.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -24,6 +24,7 @@
         <%= f.radio_button :role, Const::PeerGroupMembership::MEMBER, :label => "Member", :label_class => 'behind' %>
       <% end %>
       <%= f.submit _('Send invitation') %>
+      <%= cancel_button :url => edit_user_url(current_user) %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/app/views/links/edit.html.erb
===================================================================
--- trunk/app/views/links/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/links/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -56,6 +56,7 @@
   <div class="spacer"></div>
 
   <div class="main_column">
-    <%= render :partial => 'application/submit', :locals => {:form => form} %>
+    <%= render :partial => 'application/submit', :locals => {:form => form,
+        :cancel_url => logi_url(@logi)} %>
   </div>
 <% end %>

Modified: trunk/app/views/logi_inserts/new.html.erb
===================================================================
--- trunk/app/views/logi_inserts/new.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/logi_inserts/new.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -90,7 +90,7 @@
         <% render :layout => 'application/panel_with_tabs_js', :locals => {
             :tabs => [
                 {:text => _("Tags"), :name => "tags_link",
-                    :description => _("Insert a link to a set of tags")},
+                    :description => _("Insert a link to all logis with the following tags")},
                 {:text => _("Specific Logi"), :name => "perma_link", 
                     :description => _("Paste (Ctrl V) a permanent link to a specific logi")},
                 {:text => _("External Link"), :name => "external_link",
@@ -132,6 +132,7 @@
           <%= form.submit _('Submit'), 
               : "body_inserter.prepare_action();" +
                   " $('insert_form').submit()" %>
+          <%= cancel_button :url => logi_url(@logi) %>
         <% end %>
       </div>
     <% end %><!-- end panel_with_tabs_js -->

Modified: trunk/app/views/logi_settings/edit.html.erb
===================================================================
--- trunk/app/views/logi_settings/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/logi_settings/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -17,15 +17,16 @@
   <% if !@logi.user_group.public? %>
     <% render :layout => 'application/panel' do %>
       <% form_for(@logi, :url => logi_logi_settings_path(@logi), 
-             :html => {:id => "permissions_form"}) do |f| %>
-        <div class="field"><%= f.label 'Permissions:' %></div><br />
-        <%= f.radio_button :restriction, Const::Logi::OVERSEER, 
+             :html => {:id => "permissions_form"}) do |form| %>
+        <div class="field"><%= form.label 'Permissions:' %></div><br />
+        <%= form.radio_button :restriction, Const::Logi::OVERSEER, 
                 :label => "Everybody is allowed to edit it",
                 :label_class => 'behind' %>
-        <%= f.radio_button :restriction, Const::Logi::EDIT,
+        <%= form.radio_button :restriction, Const::Logi::EDIT,
                 :label => "Only you can edit it", 
                 :label_class => 'behind' %>
-        <%= f.submit _('Save') %>
+        <%= form.submit _('Save') %>
+        <%= cancel_button :url => logi_url(@logi) %>
       <% end %>
     <% end %>
   <% end %>
@@ -38,6 +39,7 @@
       <p>This will make it invisible</p>
       <%= form.hidden_field 'delete', :value => 'true' %>
       <%= form.submit _('Delete') %>
+      <%= cancel_button :url => logi_url(@logi) %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/app/views/logis/_edit_with_tags.html.erb
===================================================================
--- trunk/app/views/logis/_edit_with_tags.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/logis/_edit_with_tags.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -16,6 +16,7 @@
   <% render :layout => 'application/panel', :locals => {:id => "submit"} do %>
     <label><%= _('Submit') %></label>
     <%= form.submit _('Submit'), : "logiEditPrepareLink(); $('logi_form').submit()" %>
+    <%= cancel_button :url => (@logi.new_record? ? nil : logi_url(@logi)) %>
   <% end %>
   <div class="spacer"></div>
 </div>

Modified: trunk/app/views/logis/_remarks.html.erb
===================================================================
--- trunk/app/views/logis/_remarks.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/logis/_remarks.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -3,7 +3,7 @@
   <% remote_thorny_form_for([@logi, @remark], :update => {:success => 'remarks', :failure => 'errors'},
       :html => {:id => "create_remark"}) do |form| %>
     <%= text_area :remark, :message %>
-    <%= form.submit _('add remark'), :no_cancel => true, : "$('create_remark').onsubmit()", :class => 'add_button' %>
+    <%= form.submit _('add remark'), : "$('create_remark').onsubmit()", :class => 'add_button' %>
   <% end %>
   <div class="spacer"></div>
 <% end %>

Modified: trunk/app/views/password_resets/edit.html.erb
===================================================================
--- trunk/app/views/password_resets/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/password_resets/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -6,11 +6,12 @@
   <% end %>
 
   <% render :layout => 'application/panel_with_header', :locals => {:title => _('New Password') } do %>
-    <% form_for @user, :url => password_reset_path, :method => :put do |f| %>
-      <%= f.error_messages %>
-      <%= f.password_field :password %>
-      <%= f.password_field :password_confirmation %>
-      <%= f.submit "Update and log in" %>
+    <% form_for @user, :url => password_reset_path, :method => :put do |form| %>
+      <%= form.error_messages %>
+      <%= form.password_field :password %>
+      <%= form.password_field :password_confirmation %>
+      <%= form.submit "Update and log in" %>
+      <%= cancel_button :url => edit_user_url(current_user) %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/app/views/password_resets/new.html.erb
===================================================================
--- trunk/app/views/password_resets/new.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/password_resets/new.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -10,9 +10,10 @@
   <%= show_flash %>
 
   <% render :layout => 'application/panel_with_header', :locals => {:title => _('Your email') } do %>
-    <% form_for @user, :url => password_resets_path do |f| %>
-      <%= f.text_field :email %>
-      <%= f.submit _('Reset my password') %>
+    <% form_for @user, :url => password_resets_path do |form| %>
+      <%= form.text_field :email %>
+      <%= form.submit _('Reset my password') %>
+      <%= cancel_button :url => edit_user_url(current_user) %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/app/views/peer_groups/edit.html.erb
===================================================================
--- trunk/app/views/peer_groups/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/peer_groups/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -16,6 +16,7 @@
     <% form_for(@peer_group, :html => {:id => "delete_form"}) do |form| %>
       <p><%= _("Remove the %{peer_group_ll_link} peergroup") %{:peer_group_ll_link => peer_group_ll_link(@peer_group)} %></p>
       <%= form.submit _('Delete') %>
+      <%= cancel_button :url => edit_user_url(current_user) %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/app/views/peer_groups/new.html.erb
===================================================================
--- trunk/app/views/peer_groups/new.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/peer_groups/new.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -21,6 +21,7 @@
       <p><%= _("Enter the name of your Peergroup") %></p>
       <%= form.text_field 'name', :label => _("Peergroup Name") %>
       <%= form.submit _('Create') %>
+      <%= cancel_button :url => edit_user_url(current_user) %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/app/views/remarks/edit.html.erb
===================================================================
--- trunk/app/views/remarks/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/remarks/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -56,6 +56,7 @@
   <div class="spacer"></div>
 
   <div class="main_column">
-    <%= render :partial => 'application/submit', :locals => {:form => form} %>
+    <%= render :partial => 'application/submit', :locals => {:form => form,
+        :cancel_url => logi_url(@logi)} %>
   </div>
 <% end %>

Modified: trunk/app/views/searches/_navigation_bar_search_header.html.erb
===================================================================
--- trunk/app/views/searches/_navigation_bar_search_header.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/searches/_navigation_bar_search_header.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -3,6 +3,6 @@
 <% form_for(:search, nil, :url => searches_url()) do |form| %>
   <%= form.text_field :query, :name => :query, :value => @query,
           :no_label => true, :id => 'search_query' %>
-  <%= form.submit _('Search'), :no_cancel => true, :id => 'search_button' %>
+  <%= form.submit _('Search'), :id => 'search_button' %>
 <% end %>
 <div class="spacer"></div>

Modified: trunk/app/views/user_sessions/_method.html.erb
===================================================================
--- trunk/app/views/user_sessions/_method.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/user_sessions/_method.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -12,15 +12,16 @@
           new_password_reset_path %>.</p>
     <% end %>
 
-    <% form_for @user_session, :url => user_session_path do |f| %>
+    <% form_for @user_session, :url => user_session_path do |form| %>
       <% if selected == "normal" %>
-        <%= f.text_field :email %>
-        <%= f.password_field :password %>
+        <%= form.text_field :email %>
+        <%= form.password_field :password %>
       <% else %>
-        <%= f.text_field :openid_identifier %>
+        <%= form.text_field :openid_identifier %>
       <% end %>
-      <%= f.check_box :remember_me, :checked => true, :label_class => 'behind' %>
-      <%= f.submit _('Login') %>
+      <%= form.check_box :remember_me, :checked => true, :label_class => 'behind' %>
+      <%= form.submit _('Login') %>
+      <%= cancel_button %>
     <% end -%>
 
   <% end %>

Modified: trunk/app/views/users/_method.html.erb
===================================================================
--- trunk/app/views/users/_method.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/users/_method.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -14,17 +14,18 @@
       </p>
     <% end %>
 
-    <% form_for(@user, :html => {:id => "new_form"}) do |f| %>
-      <%= f.text_field 'name', :label => _("Full Name") %>
-      <%= f.text_field 'email' %>
+    <% form_for(@user, :html => {:id => "new_form"}) do |form| %>
+      <%= form.text_field 'name', :label => _("Full Name") %>
+      <%= form.text_field 'email' %>
       <% if selected == "normal" %>
-        <%= f.password_field :password %>
-        <%= f.password_field :password_confirmation %>
-        <%= f.submit _('Complete!') %>
+        <%= form.password_field :password %>
+        <%= form.password_field :password_confirmation %>
+        <%= form.submit _('Complete!') %>
       <% else %>
-        <%= f.text_field :openid_identifier %>
-        <%= f.submit _('Continue') %>
+        <%= form.text_field :openid_identifier %>
+        <%= form.submit _('Continue') %>
       <% end %>
+      <%= cancel_button %>
     <% end %>
 
   <% end %>

Modified: trunk/app/views/users/edit.html.erb
===================================================================
--- trunk/app/views/users/edit.html.erb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/app/views/users/edit.html.erb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -20,6 +20,7 @@
           options_from_collection_for_select(
               peer_groups, 'id', 'name', @prefs_profile.default_peer_group.id) %>
       <%= form.submit _('Save') %>
+      <%= cancel_button %>
     <% end %>
   <% end %>
 
@@ -29,14 +30,15 @@
   <% end %>
 
   <% render :layout => 'application/panel_with_header', :locals => {:title => _('Settings')} do %>
-    <% form_for(@user, :html => {:id => "email_form"}) do |f| %>
+    <% form_for(@user, :html => {:id => "email_form"}) do |form| %>
       <p><%= "You can " + link_to("set your avatar here", "http://gravatar.com/signup") %></p>
       <p><%= _("Leave blank/unchanged any field you don't want to change") %></p>
-      <%= f.text_field 'email' %>
-      <%= f.password_field :password %>
-      <%= f.password_field :password_confirmation %>
-      <%= f.text_field :openid_identifier %>
-      <%= f.submit _('Save') %>
+      <%= form.text_field 'email' %>
+      <%= form.password_field :password %>
+      <%= form.password_field :password_confirmation %>
+      <%= form.text_field :openid_identifier %>
+      <%= form.submit _('Save') %>
+      <%= cancel_button %>
     <% end %>
   <% end %>
 
@@ -51,6 +53,7 @@
       <p><%= _("If you delete your account, your logi's will become anonymous") %></p>
       <%= form.hidden_field 'delete', :value => 'true' %>
       <%= form.submit _('Delete') %>
+      <%= cancel_button %>
     <% end %>
   <% end %>
 </div>

Modified: trunk/lib/logi_form_builder.rb
===================================================================
--- trunk/lib/logi_form_builder.rb	2009-09-05 16:13:28 UTC (rev 1566)
+++ trunk/lib/logi_form_builder.rb	2009-09-06 11:28:43 UTC (rev 1567)
@@ -23,9 +23,6 @@
   def submit(field, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}
     string = @template.button(field, nil, options)
-    if !options[:no_cancel]
-     string += @template.cancel_button 
-    end
     return string
   end
 end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.