[Logilogi-svn] SF.net SVN: logilogi:[1562] trunk/app

Revision: 1562
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1562&view=rev
Author:   wybow
Date:     2009-09-05 13:31:45 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
Fixed add tags bug, layout of logis replying & browse bar

Modified Paths:
--------------
    trunk/app/controllers/external_links_controller.rb
    trunk/app/controllers/links_controller.rb
    trunk/app/models/external_link.rb
    trunk/app/views/logis/_commenting_logis.html.erb
    trunk/app/views/logis/_navigation_bar_browse_header.html.erb
    trunk/app/views/logis/_tag_list.html.erb

Modified: trunk/app/controllers/external_links_controller.rb
===================================================================
--- trunk/app/controllers/external_links_controller.rb	2009-09-04 15:42:32 UTC (rev 1561)
+++ trunk/app/controllers/external_links_controller.rb	2009-09-05 13:31:45 UTC (rev 1562)
@@ -16,7 +16,8 @@
 
   ### Filters
 
-  before_filter :resolve_context, :page_name, :find_logi_and_logi_version
+  before_filter :resolve_context, :page_name,
+      :find_logi_and_logi_version
 
   ### Bodies
 
@@ -41,17 +42,20 @@
       @external_link.position_ranges = new_external_link_position_range_list.
           translate_from_view(@logi_version.position_ranges)
     else
-      @external_link = ExternalLink.new(:url => params[:external_link][:url],
-          :text => params[:external_link][:text])
+      @external_link = nil
     end
 
-    if @logi.errors.empty? and @external_link.valid? and self.thorny_form_free_of_spam?
+    if @logi.errors.empty? and !@external_link.nil? and @external_link.valid? and
+        self.thorny_form_free_of_spam?
       @external_link.save
       flash[:notice] = "Successfully added external link"
       redirect_to logi_url(@logi)
     else
+      @external_link = ExternalLink.new(:url => params[:external_link][:url],
+          :text => params[:external_link][:text])
       flash[:error] = "Problem adding external link"
-      @selected = 'external_link'
+      @selected = 'link'
+      @link_selected = 'external_link'
       render :template => 'logi_inserts/new'
     end
   end

Modified: trunk/app/controllers/links_controller.rb
===================================================================
--- trunk/app/controllers/links_controller.rb	2009-09-04 15:42:32 UTC (rev 1561)
+++ trunk/app/controllers/links_controller.rb	2009-09-05 13:31:45 UTC (rev 1562)
@@ -16,8 +16,8 @@
 
   ### Filters
 
-  before_filter :resolve_context, :page_name
-  before_filter :find_logi_and_logi_version
+  before_filter :resolve_context, :page_name,
+      :find_logi_and_logi_version
 
   ### Bodies
   

Modified: trunk/app/models/external_link.rb
===================================================================
--- trunk/app/models/external_link.rb	2009-09-04 15:42:32 UTC (rev 1561)
+++ trunk/app/models/external_link.rb	2009-09-05 13:31:45 UTC (rev 1562)
@@ -34,7 +34,8 @@
   validates_presence_of :position_ranges_string
   validates_length_of :text, :maximum => 200
   validates_length_of :url, :maximum => 200
-  validates_format_of :url, :with => /^(ftp|http(s)?):\/\/.*\..*$/, :message => 'Must include http:// and a dot'
+  validates_format_of :url, :with => /^(ftp|http(s)?):\/\/.*\..*$/,
+      :message => 'Must include http:// and a dot'
 
   ### Filter-functions
 

Modified: trunk/app/views/logis/_commenting_logis.html.erb
===================================================================
--- trunk/app/views/logis/_commenting_logis.html.erb	2009-09-04 15:42:32 UTC (rev 1561)
+++ trunk/app/views/logis/_commenting_logis.html.erb	2009-09-05 13:31:45 UTC (rev 1562)
@@ -1,7 +1,7 @@
 <% render :layout => 'application/panel_with_header', :locals => {:title => _("Replying Logis"), :id => "commenting"} do %>
   <div class="mirrored_notice_cloud"><%= _('Want to give a more in-depth response ?') %></div>
   <div class="description">  
-    <p><%= _('There are %{nr} logis replying') % {:nr => logis.size} %></p>
+    <p><%= _('%{nr} Logis are replying') % {:nr => logis.size} %></p>
   </div>
   <div class="spacer"></div>
   <%= toggle_button_to_remote 'or add a logi below', {:update => "comment_area",

Modified: trunk/app/views/logis/_navigation_bar_browse_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_browse_header.html.erb	2009-09-04 15:42:32 UTC (rev 1561)
+++ trunk/app/views/logis/_navigation_bar_browse_header.html.erb	2009-09-05 13:31:45 UTC (rev 1562)
@@ -6,5 +6,5 @@
         :link => (current_context.nil? ? nil : current_context.link),
         :url => browse_logis_url(:ll_link_string => ''),
         :param_name => 'll_link_string',
-        :replace_string => ''} %>
+        :replace_string => '', :without_spacer => true} %>
 <div class="spacer"></div>

Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb	2009-09-04 15:42:32 UTC (rev 1561)
+++ trunk/app/views/logis/_tag_list.html.erb	2009-09-05 13:31:45 UTC (rev 1562)
@@ -1,19 +1,26 @@
 <div id="<%= name %>" class="tags_container transparent_corner">
   <!-- Filled via js -->
 </div>
-<div class="spacer"></div>
+<% if !local_assigns[:without_spacer] %>
+  <div class="spacer"></div>
+<% end %>
 <% if !local_assigns[:without_form] %>
   <%= form_tag("#", :method => :put) %>
 <% end %>
   <div class="add_tag_form">
-    <%= hidden_field_tag (name + '_string'), (link.nil? ? '' : link.to_s(:direction => :requested, :step => -1)), :autocomplete => "off" %>
-    <%= text_field_tag (name + '_input'), nil, :id => (name + '_input'), :class => 'tag_list' %>
-    <%= button_to_function 'Add tag', (name + '.add_tag_from_field(); ' + name + '.submit()'), :class => 'add_button tag_list' %>
+    <%= hidden_field_tag (name + '_string'),
+        (link.nil? ? '' : link.to_s(:direction => :requested, :step => -1)),
+        :autocomplete => "off" %>
+    <%= text_field_tag (name + '_input'), nil, :id => (name + '_input'),
+        :class => 'tag_list' %>
+    <%= button_to_function 'Add tag', 
+        (name + '.add_tag_from_field(); ' + name + '.submit()'),
+        :class => 'add_button tag_list' %>
   </div>
 <% if !local_assigns[:without_form] %>
   <%= end_form_tag() %>
 <% end %>
 <% javascript_tag do %>
-  var <%= name %> = new TagList('<%= name %>', '<%= url %>',
+  <%= name %> = new TagList('<%= name %>', '<%= url %>',
       '<%= param_name %>', '<%= Tag.replace.to_s %>');
 <% end %>


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