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

Revision: 1724
          http://logilogi.svn.sourceforge.net/logilogi/?rev=1724&view=rev
Author:   wybow
Date:     2010-06-13 18:28:47 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Updated edit as well, still need to fix current_context.nil? bug

Modified Paths:
--------------
    trunk/app/controllers/application_controller.rb
    trunk/app/controllers/logis_controller.rb
    trunk/app/helpers/application_helper.rb
    trunk/app/models/link.rb
    trunk/app/views/layouts/_tabs.html.erb
    trunk/app/views/logis/_contending_logis.html.erb
    trunk/app/views/logis/_navigation_bar.html.erb
    trunk/app/views/logis/_navigation_bar_browse.html.erb
    trunk/app/views/logis/_navigation_bar_edit.html.erb
    trunk/app/views/logis/_navigation_bar_new.html.erb
    trunk/app/views/logis/_navigation_bar_view.html.erb
    trunk/app/views/logis/_side_menu.html.erb
    trunk/app/views/logis/_tag_list.html.erb
    trunk/app/views/logis/index.html.erb
    trunk/app/views/logis/new.html.erb
    trunk/config/locales/en.yml
    trunk/public/images/primarytabs_background_left.png
    trunk/public/images/primarytabs_background_left.svg
    trunk/public/images/primarytabs_background_right.png
    trunk/public/images/primarytabs_background_right.svg
    trunk/public/images/secondary_tabs_background_left.png
    trunk/public/images/secondary_tabs_background_left.svg
    trunk/public/images/secondary_tabs_background_right.png
    trunk/public/images/secondary_tabs_background_right.svg
    trunk/public/javascripts/application.js
    trunk/public/javascripts/taglist.js
    trunk/public/stylesheets/logilogi.css
    trunk/test/unit/context_test.rb
    trunk/test/unit/link_test.rb

Added Paths:
-----------
    trunk/app/views/logis/_dhtml_history_js.html.erb
    trunk/app/views/logis/index_new_edit.js.rjs
    trunk/public/do/magick_corners/box.484.400.16.0.cd8282.0.png
    trunk/public/do/magick_corners/scaled_image.28.height.add_button.svg.png
    trunk/public/do/magick_corners/scaled_image.28.height.back_button.svg.png
    trunk/public/do/magick_corners/scaled_image.28.height.cancel_button.svg.png
    trunk/public/do/magick_corners/scaled_image.28.height.go_button.svg.png
    trunk/public/do/magick_corners/scaled_image.28.height.insert_button.svg.png
    trunk/public/do/magick_corners/scaled_image.28.height.ok_button.svg.png
    trunk/public/do/magick_corners/scaled_image.28.height.unfold_button.svg.png
    trunk/public/do/magick_corners/scaled_image.29.height.link_tag.svg.png
    trunk/public/do/magick_corners/scaled_image.32.height.add_tag.svg.png
    trunk/public/do/magick_corners/scaled_image.32.height.link_tag.svg.png

Removed Paths:
-------------
    trunk/app/views/logis/_navigation_bar_browse_header.html.erb
    trunk/app/views/logis/_navigation_bar_edit_header.html.erb
    trunk/app/views/logis/_navigation_bar_insert.html.erb
    trunk/app/views/logis/_navigation_bar_new_header.html.erb
    trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb
    trunk/app/views/logis/_navigation_bar_tabs.html.erb
    trunk/app/views/logis/_navigation_bar_user_group_select.html.erb
    trunk/app/views/logis/_navigation_bar_view_header.html.erb
    trunk/app/views/logis/index.js.rjs
    trunk/app/views/logis/new.js.rjs

Modified: trunk/app/controllers/application_controller.rb
===================================================================
--- trunk/app/controllers/application_controller.rb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/controllers/application_controller.rb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -644,9 +644,18 @@
     if params[:ll_link_string] and !params[:ll_link_string].empty?
       context_link_string = params[:ll_link_string]
     end
+    if params[:controller] == "logis" and
+        (params[:action] == "new" or params[:action] == "edit")
+      force = true
+      if context_link_string.split('/')[0] == Tag.sandbox.to_s
+        context_link_string = nil
+      end
+    else
+      force = params[:force]
+    end
     if context_link_string
-      self.current_context = Context.new(context_link_string,
-          :force => params[:force])
+      self.current_context = Context.new(
+          context_link_string, :force => force)
     else
       self.current_context = nil
     end

Modified: trunk/app/controllers/logis_controller.rb
===================================================================
--- trunk/app/controllers/logis_controller.rb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/controllers/logis_controller.rb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -43,8 +43,8 @@
       : [:show]
   side_body :side_menu, :activity, :remarks_and_recent_votes,
       : [:show]
-  side_body :new_side_menu,
-      : [:new], :format => [:html, :js]
+  side_body :new_edit_side_menu,
+      : [:new, :edit], :format => [:html, :js]
   side_body :cloud, :new_users, :tag_sets, :incoming_links_to_tags,
       : [:index], :format => [:html, :js]
 
@@ -85,7 +85,10 @@
             @clear_button = render_to_string(:partial => 'clear_button',
                 :locals => {:button_text => t('v.logis.clear_query')})
           end
-          render :template => 'logis/index.js.rjs'
+          render :template => 'logis/index_new_edit.js.rjs', :locals => {
+              :name => "browse_list",
+              :url => (current_context.nil? ? nil : "/do/logis/" + current_context.link.to_s),
+              :with_main => true}
         end
       end
       format.xml do
@@ -119,27 +122,13 @@
   end
 
   def new
-    @force = params[:force]
     respond_to do |format|
       format.html
       format.js do
-        if params[:selected]
-          @selected = params[:selected]
-          select_body(@selected)
-        else
-          @primary_tabs = render_to_string(:partial => 'layouts/tabs')
-          if current_context.nil?
-            @add_tag_button = render_to_string(:partial => 'add_tag_button',
-                :locals => {:name => 'browse_list',
-                    :button_text => t('v.logis.set_tag'),
-                    :button_class => 'go_button'})
-            @clear_button = ""
-          else
-            @add_tag_button = render_to_string(:partial => 'add_tag_button',
-                :locals => {:name => 'browse_list'})
-            @clear_button = render_to_string(:partial => 'clear_button')
-          end
-        end
+        self.new_edit_js_response
+        render :template => 'logis/index_new_edit.js.rjs', :locals => {
+            :name => "logi_tags_edit_list", 
+            :url => (current_context.nil? ? nil : "/" + current_context.link.to_s + "/do/new")}
       end
     end
   end
@@ -180,13 +169,21 @@
   end
 
   def edit
-    @selected = params[:selected]
     if !@logi.edit_rights?(current_user)
       flash[:warning] = t 'c.logis.error_permission'
       redirect_to logi_ll_url(@logi)
       return
     end
-    render :layout => 'blank'
+
+    respond_to do |format|
+      format.html
+      format.js do
+        self.new_edit_js_response
+        render :template => 'logis/index_new_edit.js.rjs', :locals => {
+            :name => "logi_tags_edit_list", 
+            :url => (current_context.nil? ? nil : "/" + current_context.link.to_s + "/do/edit")}
+      end
+    end
   end
 
   def update
@@ -282,6 +279,26 @@
     end
   end
 
+  def new_edit_js_response
+    if params[:selected]
+      @selected = params[:selected]
+      select_body(@selected)
+    else
+      @primary_tabs = render_to_string(:partial => 'layouts/tabs')
+      if current_context.nil?
+        @add_tag_button = render_to_string(:partial => 'add_tag_button',
+            :locals => {:name => 'browse_list',
+                :button_text => t('v.logis.set_tag'),
+                :button_class => 'go_button'})
+        @clear_button = ""
+      else
+        @add_tag_button = render_to_string(:partial => 'add_tag_button',
+            :locals => {:name => 'browse_list'})
+        @clear_button = render_to_string(:partial => 'clear_button')
+      end
+    end
+  end
+
   ### Filter-methods
 
   def new_logi_and_logi_version
@@ -302,6 +319,8 @@
         @page_name = self.auto_page_name + ' - ' + 
             self.current_context.link.to_s(
                 :for => :show, :direction => :requested)
+      else
+        @page_name = ""
       end
     end
   end
@@ -454,7 +473,7 @@
     self.side_menu_selected
   end
 
-  def new_side_menu
+  def new_edit_side_menu
     if @body_selected or !params[:selected]
       if !@selected
         @selected = "contending_logis"

Modified: trunk/app/helpers/application_helper.rb
===================================================================
--- trunk/app/helpers/application_helper.rb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/helpers/application_helper.rb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -167,9 +167,13 @@
   end
 
   def add_simple_history(name, tags_string)
-    page << %[dhtmlHistory.add("#{name}", "browse_list.replace_tags_string('#{tags_string}'); browse_list.submit();")]
+    page << add_simple_history_string(name, tags_string)
   end
 
+  def add_simple_history_string(name, tags_string)
+    return %[dhtmlHistory.add("#{name}", "browse_list.replace_tags_string('#{tags_string}'); browse_list.submit();")]
+  end
+
   def edit_tabs
     logi = current_context.link.volatile_to_logi
     tabs = [{:text => t('h.application.edit_text'), :name => "edit_text",

Modified: trunk/app/models/link.rb
===================================================================
--- trunk/app/models/link.rb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/models/link.rb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -417,8 +417,14 @@
         self.resolve_matches_for_all_requested_tags
       end
     else
-      # resolve logi-link
-      self.resolve_tags_for_to_logi
+      # resolve to-logi-link
+      if options[:force].nil?
+        # resolve logi-link
+        self.resolve_tags_for_to_logi
+      else
+        # simply set received tags
+        self.receive_tags_for_to_logi
+      end
     end
     return self
   end
@@ -750,6 +756,16 @@
     self.link_matches.build(:logi => self.to_logi)
   end
 
+  # Sub-function for resolve.
+  #
+  # Sets the received_tags to the requested tags, and the match to the
+  # logi, forced.
+  #
+  def receive_tags_for_to_logi
+    self.received_tags = self.requested_tags.dup
+    self.link_matches.build(:logi => self.to_logi)
+  end
+
   ### Link parts for use and show
 
   # Sub-function for the different *_to_s functions that turns a tag-

Modified: trunk/app/views/layouts/_tabs.html.erb
===================================================================
--- trunk/app/views/layouts/_tabs.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/layouts/_tabs.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,17 +1,25 @@
 <div id="primarytabs">
   <%
-if current_context.nil? or current_context.link.requested_tags.first == Tag.sandbox
-  search_u = root_url
+if current_context.nil?
   view_u = logi_url(:ll_link_string => GlobalConfig.main_page_tag.to_s)
 else
-  search_u = browse_ll_url(current_context.link)
   view_u = ll_url(current_context.link)
+
+  if current_context.link.found_logi?
+    logi = current_context.link.volatile_to_logi
+    if logi.edit_rights?(current_user)
+      edit_u = edit_logi_url(current_context.link.volatile_to_logi)
+    end
+  end
 end
+edit_u ||= nil
+search_u = root_url()
 new_u = new_logi_url()
   %>
   <ul>
     <li id="primarytabs_search"><%= link_to t('v.layouts.search'), search_u %></li>
     <li id="primarytabs_view"><%= link_to t('v.layouts.view'), view_u %></li>
+    <li id="primarytabs_edit"<%= (edit_u ? '>' + link_to(t('v.layouts.edit'), edit_u) : ' class="disabled"><span>' + t('v.layouts.edit') + '</span>') %></li>
     <li id="primarytabs_new"><%= link_to t('v.layouts.new'), new_u %></li>
     <li id="primarytabs_changes"><%= link_to t('v.layouts.changes'), changes_url %></li>
     <li id="primarytabs_users"><%= link_to t('v.layouts.logi_blogs'), users_url %></li>

Modified: trunk/app/views/logis/_contending_logis.html.erb
===================================================================
--- trunk/app/views/logis/_contending_logis.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_contending_logis.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,6 +1,6 @@
 <% 
 local_contender_logis = band_of_contender_logis(@logi, contender_logis) 
-if @logi.new_record?
+if !local_contender_logis.include?(@logi)
   local_contender_logis.insert(0, @logi)
 end
 %>
@@ -23,7 +23,7 @@
     <div class="spacer"></div>
   </div>
 <% else %>
-  <% if !@logi.new_record? %>
+  <% if params[:action] != "new" and params[:action] != "edit" %>
     <div id="contenders_padding">
       <div class="notice_cloud"><%= t('v.logis.can_do_better') %></div>
       <%= new_logi_button t('v.logis.create_new_competing_logi') %>
@@ -44,7 +44,7 @@
   <% if contender_logis.size > 3 %>.
     <div class="browse_all">
       <%= button_to t('v.logis.browse_all'), browse_logis_url(),
-          :class => 'back_button' %>
+          :class => 'go_button' %>
       <div class="spacer"></div>
     </div>
   <% end %>

Added: trunk/app/views/logis/_dhtml_history_js.html.erb
===================================================================
--- trunk/app/views/logis/_dhtml_history_js.html.erb	                        (rev 0)
+++ trunk/app/views/logis/_dhtml_history_js.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -0,0 +1,19 @@
+<% javascript_tag do -%>
+  window.dhtmlHistory.create({
+    toJSON: function(o) {
+      return Object.toJSON(o);
+    },
+    fromJSON: function(s) {
+      return s.evalJSON();
+    }
+  });
+
+  var pageListener = function(newLocation, historyData) {
+    eval(historyData);
+  };
+
+  Event.observe(window, 'load', function() {
+    dhtmlHistory.initialize();
+    dhtmlHistory.addListener(pageListener);
+  }); 
+<% end %>

Modified: trunk/app/views/logis/_navigation_bar.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,5 +1,5 @@
 <div id="navigation_bar" class="box">
   <div class="panel_content_padding">
-    <%= header %>
+    <%= yield %>
   </div>
 </div>

Modified: trunk/app/views/logis/_navigation_bar_browse.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_browse.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_browse.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,5 +1,16 @@
 <% render :layout => 'navigation_bar', :locals => {
-    :selected => "navigation_browse", :header => render_to_string(
-        :partial => 'navigation_bar_browse_header')} do %>
-  <%= render :partial => 'navigation_bar_peer_group_select' %>
+    :selected => "navigation_browse"} do %>
+  <div id="clear_button_space">
+    <%= render :partial => 'clear_button',
+        :locals => {:button_text => t('v.logis.clear_query')} %>
+  </div>
+  <%= render :partial => 'tag_list', :locals => {:name => 'browse_list',
+        :link => (current_context.nil? ? nil : current_context.link),
+        :url => browse_logis_url(:ll_link_string => ''),
+        :param_name => 'll_link_string',
+        :replace_string => '', :without_spacer => true,
+        :no_focus => true, :replace_pre => true,
+        :button_text => (current_context.nil? ? t('v.logis.search_word_or_tag') : t('v.logis.add_word_or_tag')),
+        :button_class => (current_context.nil? ? 'go_button' : nil)} %>
+  <div class="spacer"></div>
 <% end %>

Deleted: trunk/app/views/logis/_navigation_bar_browse_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_browse_header.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_browse_header.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,13 +0,0 @@
-<div id="clear_button_space">
-  <%= render :partial => 'clear_button', 
-      :locals => {:button_text => t('v.logis.clear_query')} %>
-</div>
-<%= render :partial => 'tag_list', :locals => {:name => 'browse_list', 
-        :link => (current_context.nil? ? nil : current_context.link),
-        :url => browse_logis_url(:ll_link_string => ''),
-        :param_name => 'll_link_string',
-        :replace_string => '', :without_spacer => true,
-        :no_focus => true, :replace_pre => true,
-        :button_text => (current_context.nil? ? t('v.logis.search_word_or_tag') : t('v.logis.add_word_or_tag')),
-        :button_class => (current_context.nil? ? 'go_button' : nil)} %>
-<div class="spacer"></div>

Modified: trunk/app/views/logis/_navigation_bar_edit.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_edit.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_edit.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,4 +1,16 @@
 <% render :layout => 'logis/navigation_bar', :locals => {
-    :selected => "navigation_edit", :header => render_to_string(
-        :partial => 'logis/navigation_bar_edit_header')} do %>
+    :selected => "navigation_edit"} do %>
+  <div id="clear_button_space">
+    <%= render :partial => 'clear_button' %>
+  </div>
+  <%= render :partial => 'tag_list', :locals => {:name => 'logi_tags_edit_list',
+        :link => (current_context.nil? ? nil : current_context.link),
+        :url => edit_logi_url(current_context.link.volatile_to_logi),
+        :param_name => 'new_ll_link_string',
+        :replace_string => Tag.sandbox.to_s, :without_spacer => true,
+        :no_focus => false, :replace_pre => false,
+        :button_text => (current_context.nil? ? t('v.logis.set_tag') : nil),
+        :button_class => (current_context.nil? ? 'go_button' : nil),
+        :logi_string => @logi.to_s} %>
+  <div class="spacer"></div> 
 <% end %>

Deleted: trunk/app/views/logis/_navigation_bar_edit_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_edit_header.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_edit_header.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,27 +0,0 @@
-<%= button_to t('v.logis.back_view'), ll_url(current_context.link),
-    :class => 'back_button' %>
-<div class="spacer"></div>
-<div class="tags_container transparent_corner">
-  <% link = current_context.link %>
-  <% tags = link.requested_tags %>
-  <%= link_to_navigation_tag(
-          link.to_s(:for => :show, :direction => :requested,
-              :step => 0, :per_part => true),
-          ll_url(link, :direction => :requested, :step => 0)) %>
-  <% if link.size(:requested) > 1 %>
-    <% (1..(link.size(:requested) - 1)).each do |i| %>
-      <div class="tag_separator">/</div>
-      <%= link_to_navigation_tag(
-              link.to_s(:for => :show, :direction => :requested,
-                  :step => i, :per_part => true),
-              ll_url(link, :direction => :requested, :step => i)) %>
-    <% end %>
-  <% end %>
-  <% if !link.volatile_to_logi.nil? %>
-    <div class="equal_author">=</div>
-    <%= link_to_navigation_author(
-            link.volatile_to_logi.to_s(:for => :full_show),
-            ll_url(link, :spec_step => :logi)) %>
-  <% end %>
-  <div class="spacer"></div>
-</div>

Deleted: trunk/app/views/logis/_navigation_bar_insert.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_insert.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_insert.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,4 +0,0 @@
-<% render :layout => 'logis/navigation_bar', :locals => {
-    :selected => "navigation_insert", :header => render_to_string(
-        :partial => 'logis/navigation_bar_edit_header')} do %>
-<% end %>

Modified: trunk/app/views/logis/_navigation_bar_new.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_new.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_new.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,5 +1,15 @@
 <% render :layout => 'logis/navigation_bar', :locals => {
-    :selected => "navigation_new", :header => render_to_string(
-        :partial => 'logis/navigation_bar_new_header')} do %>
-  <%= render :partial => 'logis/navigation_bar_user_group_select' %>
+    :selected => "navigation_new"} do %>
+  <div id="clear_button_space">
+    <%= render :partial => 'clear_button' %>
+  </div>
+  <%= render :partial => 'tag_list', :locals => {:name => 'logi_tags_edit_list',
+        :link => (current_context.nil? ? nil : current_context.link),
+        :url => new_logi_url(),
+        :param_name => 'new_ll_link_string',
+        :replace_string => Tag.sandbox.to_s, :without_spacer => true,
+        :no_focus => false, :replace_pre => false,
+        :button_text => (current_context.nil? ? t('v.logis.set_tag') : nil),
+        :button_class => (current_context.nil? ? 'go_button' : nil)} %>
+  <div class="spacer"></div>
 <% end %>

Deleted: trunk/app/views/logis/_navigation_bar_new_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_new_header.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_new_header.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,21 +0,0 @@
-<div id="clear_button_space">
-  <% if !current_context.link.requested_tags.first == Tag.sandbox %>
-    <%= render :partial => 'clear_button' %>
-  <% end %>
-</div>
-<% 
-if current_context.nil? or current_context.link.requested_tags.first == Tag.sandbox
-  c_link = nil
-else 
-  c_link = current_context.link
-end
-%>
-<%= render :partial => 'tag_list', :locals => {:name => 'browse_list',
-        :link => c_link,
-        :url => new_logi_url(),
-        :param_name => 'new_ll_link_string',
-        :replace_string => Tag.sandbox.to_s, :without_spacer => true,
-        :no_focus => false, :replace_pre => false,
-        :button_text => (current_context.link.requested_tags.first == Tag.sandbox ? t('v.logis.set_tag') : nil),
-        :button_class => (current_context.link.requested_tags.first == Tag.sandbox ? 'go_button' : nil)} %>
-<div class="spacer"></div>

Deleted: trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_peer_group_select.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,12 +0,0 @@
-<!--
-<% form_for(:prefs_profile, nil, :url => select_prefs_profile_url,
-    :html => {:id => "quick_select", :name => "quick_select"}) do |form| %>
-  <p>
-    <span class="faded" style="float:left;"><%= t('v.logis.peer_group_label') %></span>
-      <%= select_tag 'peer_group_id', options_from_collection_for_select(
-              PeerGroup.find(:all), "id", "short_name", 
-              current_prefs.peer_group.id), 
-          :class => "styled", : "$('quick_select').submit()" %>
-  </p>
-<% end %>
--->

Deleted: trunk/app/views/logis/_navigation_bar_tabs.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_tabs.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_tabs.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,4 +0,0 @@
-<% tabs = panel_tab_links(navigation_tabs()) %>
-<%= render :partial => 'application/panel_with_tabs_tabs', :locals => {
-        :tabs => tabs, :after_button => new_logi_button(),
-        :selected => selected, :id => local_assigns[:id]} %>

Deleted: trunk/app/views/logis/_navigation_bar_user_group_select.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_user_group_select.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_user_group_select.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,7 +0,0 @@
-<% form_for(:prefs_profile, nil, :url => select_prefs_profile_url,
-    :html => {:id => "quick_select", :name => "quick_select"}) do |form| %>
- <!--    <span class="faded"><%= t 'v.logis.usergroup_label' %></span>
-    <%= current_prefs.user_group.name %>
-   <%= select_tag 'user_group_id', options_from_collection_for_select(current_user.user_groups, "id", "name",
-        current_prefs.user_group.id), : "$('quick_select').submit()" %> -->
-<% end %>

Modified: trunk/app/views/logis/_navigation_bar_view.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_view.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_view.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,5 +1,29 @@
 <% render :layout => 'navigation_bar', :locals => {
-    :selected => "navigation_view", :header => render_to_string(
-        :partial => 'navigation_bar_view_header')} do %>
-  <%= render :partial => 'navigation_bar_peer_group_select' %>
+    :selected => "navigation_view"} do %>
+  <%= button_to t('v.logis.back_browse'), browse_logis_url(),
+      :class => 'back_button' %>
+  <div class="tags_container">
+    <% link = current_context.link %>
+    <% tags = link.requested_tags %>
+    <%= link_to_navigation_tag(
+            link.to_s(:for => :show, :direction => :requested,
+                :step => 0, :per_part => true),
+            ll_url(link, :direction => :requested, :step => 0)) %>
+    <% if link.size(:requested) > 1 %>
+      <% (1..(link.size(:requested) - 1)).each do |i| %>
+        <div class="tag_separator">/</div>
+        <%= link_to_navigation_tag(
+                link.to_s(:for => :show, :direction => :requested,
+                    :step => i, :per_part => true),
+                ll_url(link, :direction => :requested, :step => i)) %>
+      <% end %>
+    <% end %>
+    <% if !link.volatile_to_logi.nil? %>
+      <div class="equal_author">=</div>
+      <%= link_to_navigation_author(
+              link.volatile_to_logi.to_s(:for => :full_show),
+              ll_url(link, :spec_step => :logi)) %>
+    <% end %>
+  </div>
+  <div class="spacer"></div>
 <% end %>

Deleted: trunk/app/views/logis/_navigation_bar_view_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_view_header.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_navigation_bar_view_header.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,26 +0,0 @@
-<%= button_to t('v.logis.back_browse'), browse_logis_url(),
-    :class => 'back_button' %>
-<div class="tags_container">
-  <% link = current_context.link %>
-  <% tags = link.requested_tags %>
-  <%= link_to_navigation_tag(
-          link.to_s(:for => :show, :direction => :requested,
-              :step => 0, :per_part => true),
-          ll_url(link, :direction => :requested, :step => 0)) %>
-  <% if link.size(:requested) > 1 %>
-    <% (1..(link.size(:requested) - 1)).each do |i| %>
-      <div class="tag_separator">/</div>
-      <%= link_to_navigation_tag(
-              link.to_s(:for => :show, :direction => :requested,
-                  :step => i, :per_part => true),
-              ll_url(link, :direction => :requested, :step => i)) %>
-    <% end %>
-  <% end %>
-  <% if !link.volatile_to_logi.nil? %>
-    <div class="equal_author">=</div>
-    <%= link_to_navigation_author(
-            link.volatile_to_logi.to_s(:for => :full_show),
-            ll_url(link, :spec_step => :logi)) %>
-  <% end %>
-</div>
-<div class="spacer"></div>

Modified: trunk/app/views/logis/_side_menu.html.erb
===================================================================
--- trunk/app/views/logis/_side_menu.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_side_menu.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,4 +1,4 @@
-<% if current_context.nil? or current_context.link.requested_tags.first == Tag.sandbox %>
+<% if current_context.nil? %>
   <% render :layout => 'application/attention_panel', :locals => {
       :id => "set_tag"} do %>
     <h2><%= t 'v.logis.set_a_tag' %></h2>
@@ -7,7 +7,7 @@
 <% else %>
 <% 
 selected ||= "contending_logis"
-if @logi.new_record?
+if params[:action] == "new" or params[:action] == "edit"
   tabs = new_side_menu_tabs() 
 else
   tabs = side_menu_tabs() 

Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/_tag_list.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -38,8 +38,9 @@
           Tag.replace.to_s(:for => :show)) %>',
       "<%= t('defaults.error_tag_invalid_string') %>",
       "<%= t('defaults.error_tag_reserved_words') %>",
-      <%= local_assigns[:replace_pre] ? "true" : "false" %>);
+      <%= local_assigns[:replace_pre] ? "true" : "false" %>,
+      <%= local_assigns[:logi_string] ? '"' + local_assigns[:logi_string] + '"' : "null" %>);
   <% if !local_assigns[:no_focus] %>
-    <%= "$('" + name + "_input').focus();" %>
+    window.<%= name %>.focus();
   <% end %>
 <% end %>

Modified: trunk/app/views/logis/index.html.erb
===================================================================
--- trunk/app/views/logis/index.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/index.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,25 +1,9 @@
 <%# all is included via bodies for ajax #%>
+<%= render :partial => 'dhtml_history_js.html.erb' %>
 <% javascript_tag do -%>
-   window.dhtmlHistory.create({
-    toJSON: function(o) {
-      return Object.toJSON(o);
-    },
-    fromJSON: function(s) {
-      return s.evalJSON();
-    }
-  });
-
-  var pageListener = function(newLocation, historyData) {
-    eval(historyData);
-  };
-
-  Event.observe(window, 'load', function() {
-    dhtmlHistory.initialize();
-    dhtmlHistory.addListener(pageListener);
-  }); 
   <% if current_context.nil? %>
     if (dhtmlHistory.isFirstLoad()) {
-      dhtmlHistory.add('', "browse_list.replace_tags_string(''); browse_list.submit();")
+      <%= add_simple_history_string("", "") %>
     }
   <% end -%>
 <% end %>

Deleted: trunk/app/views/logis/index.js.rjs
===================================================================
--- trunk/app/views/logis/index.js.rjs	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/index.js.rjs	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,12 +0,0 @@
-page.replace 'primarytabs', @primary_tabs
-page.replace_html 'clear_button_space', @clear_button
-page.replace_html 'add_tag_button_space', @add_tag_button
-page.replace_html 'main_body', @content_for_main_body
-page.replace_html 'side_body', @content_for_side_body
-page.call("mcorners.run")
-page.call("focusBrowseListInput")
-if current_context.nil?
-  page.add_simple_history('', '')
-else
-  page.add_simple_history("/do/logis/" + current_context.link.to_s, current_context.link.to_s)
-end

Added: trunk/app/views/logis/index_new_edit.js.rjs
===================================================================
--- trunk/app/views/logis/index_new_edit.js.rjs	                        (rev 0)
+++ trunk/app/views/logis/index_new_edit.js.rjs	2010-06-13 18:28:47 UTC (rev 1724)
@@ -0,0 +1,14 @@
+page.replace 'primarytabs', @primary_tabs
+page.replace_html 'clear_button_space', @clear_button
+page.replace_html 'add_tag_button_space', @add_tag_button
+if local_assigns[:with_main]
+  page.replace_html 'main_body', @content_for_main_body
+end
+page.replace_html 'side_body', @content_for_side_body
+page.call("mcorners.run")
+page.call(name + ".focus")
+if current_context.nil?
+  page.add_simple_history('', '')
+else
+  page.add_simple_history(url, current_context.link.to_s)
+end

Modified: trunk/app/views/logis/new.html.erb
===================================================================
--- trunk/app/views/logis/new.html.erb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/new.html.erb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,3 +1,11 @@
+<%= render :partial => 'dhtml_history_js.html.erb' %>
+<% javascript_tag do -%>
+  <% if current_context.nil? %>
+    if (dhtmlHistory.isFirstLoad()) {
+      <%= add_simple_history_string("","") %>
+    }
+  <% end -%>
+<% end %>
 <% thorny_form_for(@logi, :url => logis_path(:force => true), 
        :method => :post, :html => {:id => "logi_form"}) do |form| %>
   <%= render :partial => 'edit_with_tags', :locals => {:form => form} %>

Deleted: trunk/app/views/logis/new.js.rjs
===================================================================
--- trunk/app/views/logis/new.js.rjs	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/app/views/logis/new.js.rjs	2010-06-13 18:28:47 UTC (rev 1724)
@@ -1,12 +0,0 @@
-page.replace 'primarytabs', @primary_tabs
-page.replace_html 'clear_button_space', @clear_button
-page.replace_html 'add_tag_button_space', @add_tag_button
-page.replace_html 'side_body', @content_for_side_body
-page.call("mcorners.run")
-page.call("focusBrowseListInput")
-# TODO
-#if current_context.nil?
-#  page.add_simple_history('', '')
-#else
-#  page.add_simple_history("/do/logis/" + current_context.link.to_s, current_context.link.to_s)
-#end

Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/config/locales/en.yml	2010-06-13 18:28:47 UTC (rev 1724)
@@ -594,18 +594,19 @@
       back_soon: "We hope to see you back with Firefox soon :)"
       best_viewed_with: "Best viewed with {{link_open}}Firefox{{link_close}}"
       changes: Changes
-      logi_blogs: "Logi blogs"
       contact_us: "Contact us"
       content_creative_commons: "All content is available under the {{link_open}}Creative Commons Attribution-Share Alike License{{link_close}}."
       development_happens: "Development happens on {{link_open}}our Sourceforge page{{link_close}}."
       docs_development_list: "({{docs_open}}docs{{link_close}}, {{development_open}}development{{link_close}}, {{list_open}}list{{link_close}})"
       documentation_instructions: "Documentation and installation instructions {{link_open}}are here{{link_close}}."
+      edit: Edit
       enable_or_get: "So please enable javascript and/or {{link_open}}get Firefox{{link_close}}."
       free_software_licensed: "LogiLogi is {{free_open}}Free Software{{link_close}} and licensed under the {{affero_open}}Affero GPL v3{{link_close}}."
       groups: Groups
       header_description: "In-depth philosophical discussions; Short hypertexts, easy linking and meritocratic rating; Philosophy beyond the Book"
       header_keywords: "LogiLogi logi notes student students philosophy book article articles history discussion together collective future questions wiki"
       link_download: "available for download"
+      logi_blogs: "Logi blogs"
       logi_logi_foundation: "The LogiLogi Foundation"
       logi_logi_network_label: "Part of the LogiLogi Network:"
       login: "Login"

Added: trunk/public/do/magick_corners/box.484.400.16.0.cd8282.0.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/box.484.400.16.0.cd8282.0.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.add_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.add_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.back_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.back_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.cancel_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.cancel_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.go_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.go_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.insert_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.insert_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.ok_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.ok_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.28.height.unfold_button.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.28.height.unfold_button.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.29.height.link_tag.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.29.height.link_tag.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.32.height.add_tag.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.32.height.add_tag.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/public/do/magick_corners/scaled_image.32.height.link_tag.svg.png
===================================================================
(Binary files differ)


Property changes on: trunk/public/do/magick_corners/scaled_image.32.height.link_tag.svg.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/public/images/primarytabs_background_left.png
===================================================================
(Binary files differ)

Modified: trunk/public/images/primarytabs_background_left.svg
===================================================================
--- trunk/public/images/primarytabs_background_left.svg	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/images/primarytabs_background_left.svg	2010-06-13 18:28:47 UTC (rev 1724)
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.47 r22583"
    width="15"
-   height="300"
+   height="600"
    sodipodi:docname="primarytabs_background_left.svg"
    inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/primarytabs_background_left.png"
    inkscape:export-xdpi="90"
@@ -55,7 +55,7 @@
      showgrid="false"
      inkscape:zoom="2.2250293"
      inkscape:cx="7.5"
-     inkscape:cy="212.32703"
+     inkscape:cy="446.03182"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1"
@@ -67,8 +67,8 @@
      d=""
      id="path4052" />
   <path
-     style="fill:#30367e;fill-opacity:1;stroke:#30367e;stroke-opacity:1;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
-     d="m 15,1 8.673729,0 c 7.756,0 14,6.1607472 14,13.813334 l 0,120.373336 c 0,7.65258 -6.244,13.81333 -14,13.81333 L 15,149 c -7.756,0 -14,0 -14,0 L 1,14.813334 C 1,7.1607472 7.244,1 15,1 z"
+     style="fill:#30367e;fill-opacity:1;stroke:#30367e;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 15,1 8.673729,0 c 7.756,0 14,6.16075 14,13.81333 l 0,120.37334 c 0,7.65258 -6.244,13.81333 -14,13.81333 L 15,149 c -7.756,0 -14,0 -14,0 L 1,14.81333 C 1,7.16075 7.244,1 15,1 z"
      id="rect4054"
      sodipodi:nodetypes="ccccccccc" />
   <path
@@ -76,4 +76,14 @@
      id="path4855"
      d="m 15,151 8.673729,0 c 7.756,0 14,6.16075 14,13.81333 l 0,120.37334 c 0,7.65258 -6.244,13.81333 -14,13.81333 L 15,299 c -7.756,0 -14,0 -14,0 L 1,164.81333 C 1,157.16075 7.244,151 15,151 z"
      style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     sodipodi:nodetypes="ccccccccc"
+     id="path6279"
+     d="m 15,301 8.673729,0 c 7.756,0 14,6.16075 14,13.81333 l 0,120.37334 c 0,7.65258 -6.244,13.81333 -14,13.81333 L 15,449 c -7.756,0 -14,0 -14,0 L 1,314.81333 C 1,307.16075 7.244,301 15,301 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     style="fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 15,451 8.673729,0 c 7.756,0 14,6.16075 14,13.81333 l 0,120.37334 c 0,7.65258 -6.244,13.81333 -14,13.81333 L 15,599 c -7.756,0 -14,0 -14,0 L 1,464.81333 C 1,457.16075 7.244,451 15,451 z"
+     id="path6281"
+     sodipodi:nodetypes="ccccccccc" />
 </svg>

Modified: trunk/public/images/primarytabs_background_right.png
===================================================================
(Binary files differ)

Modified: trunk/public/images/primarytabs_background_right.svg
===================================================================
--- trunk/public/images/primarytabs_background_right.svg	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/images/primarytabs_background_right.svg	2010-06-13 18:28:47 UTC (rev 1724)
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.47 r22583"
    width="400"
-   height="300"
+   height="600"
    sodipodi:docname="primarytabs_background_right.svg"
    inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/primarytabs_background_right.png"
    inkscape:export-xdpi="90"
@@ -63,15 +63,25 @@
      inkscape:window-maximized="1"
      inkscape:current-layer="svg4917" />
   <path
-     style="fill:#30367e;fill-opacity:1;stroke:#30367e;stroke-width:2.00840187000000014;stroke-miterlimit:4;stroke-opacity:1"
-     d="m 14.981204,1.004207 370.037606,0 c 7.74326,0 13.977,6.222839 13.977,13.952553 l 0,134.04324 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -370.037606,0 C 7.2379443,148.9958 1.004,149 1.004,149 L 1.0042009,14.95676 c 0,-7.729714 6.2337434,-13.952553 13.9770031,-13.952553 z"
+     style="fill:#30367e;fill-opacity:1;stroke:#30367e;stroke-width:2.00840187;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 14.981204,1.0000091 370.037606,0 c 7.74326,0 13.977,6.22284 13.977,13.9525499 l 0,134.043241 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -370.037606,0 C 7.2379443,148.9916 1.004,148.9958 1.004,148.9958 L 1.0042009,14.952559 c 0,-7.7297099 6.2337434,-13.9525499 13.9770031,-13.9525499 z"
      id="rect4929"
      sodipodi:nodetypes="ccccccccc" />
   <path
      sodipodi:nodetypes="ccccccccc"
      id="path4934"
      d="m 14.981191,151.00419 370.037629,0 c 7.74326,0 13.977,6.22266 13.977,13.95216 l 0,134.03946 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -370.037629,0 c -7.7432603,-2e-4 -13.9772051,0.004 -13.9772051,0.004 l 2.009e-4,-134.03946 c 0,-7.7295 6.2337439,-13.95216 13.9770042,-13.95216 z"
-     style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2.00837374000000013;stroke-miterlimit:4;stroke-opacity:1"
+     style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2.00837374;stroke-miterlimit:4;stroke-opacity:1"
      inkscape:export-xdpi="90"
      inkscape:export-ydpi="90" />
+  <path
+     sodipodi:nodetypes="ccccccccc"
+     id="path7359"
+     d="m 14.981204,301.00001 370.037606,0 c 7.74326,0 13.977,6.22284 13.977,13.95255 l 0,134.04324 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -370.037606,0 C 7.2379443,448.9916 1.004,448.9958 1.004,448.9958 l 2.009e-4,-134.04324 c 0,-7.72971 6.2337434,-13.95255 13.9770031,-13.95255 z"
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.00840187000000014;stroke-miterlimit:4;stroke-opacity:1" />
+  <path
+     style="fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2.00840187000000014;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 14.981204,451.00001 370.037606,0 c 7.74326,0 13.977,6.22284 13.977,13.95255 l 0,134.04324 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -370.037606,0 C 7.2379443,598.9916 1.004,598.9958 1.004,598.9958 l 2.009e-4,-134.04324 c 0,-7.72971 6.2337434,-13.95255 13.9770031,-13.95255 z"
+     id="path7361"
+     sodipodi:nodetypes="ccccccccc" />
 </svg>

Modified: trunk/public/images/secondary_tabs_background_left.png
===================================================================
(Binary files differ)

Modified: trunk/public/images/secondary_tabs_background_left.svg
===================================================================
--- trunk/public/images/secondary_tabs_background_left.svg	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/images/secondary_tabs_background_left.svg	2010-06-13 18:28:47 UTC (rev 1724)
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.47 r22583"
    width="15"
-   height="300"
+   height="450"
    sodipodi:docname="secondary_tabs_background_left.svg"
    inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/secondary_tabs_background_left.png"
    inkscape:export-xdpi="90"
@@ -62,14 +62,14 @@
      showgrid="false"
      inkscape:zoom="2.2250293"
      inkscape:cx="7.5"
-     inkscape:cy="194.45336"
+     inkscape:cy="356.24898"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg6241" />
   <path
-     style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     d="m 15,1.0000009 8.673729,0 c 7.756002,0 14.000002,6.16075 14.000002,13.8133401 l 0,120.373329 c 0,7.65258 -6.244,13.81333 -14.000002,13.81333 L 15,149 c -7.756,0 -14,0 -14,0 L 1,14.813341 C 1,7.1607509 7.244,1.0000009 15,1.0000009 z"
+     style="fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 15,301 8.673729,0 c 7.756002,0 14.000002,6.16075 14.000002,13.81334 l 0,120.37333 c 0,7.65258 -6.244,13.81333 -14.000002,13.81333 L 15,449 c -7.756,0 -14,0 -14,0 L 1,314.81334 C 1,307.16075 7.244,301 15,301 z"
      id="rect4054"
      sodipodi:nodetypes="ccccccccc" />
   <path
@@ -77,4 +77,9 @@
      id="path6275"
      d="m 15,151 8.673729,0 c 7.756002,0 14.000002,6.16075 14.000002,13.81334 l 0,120.37333 c 0,7.65258 -6.244,13.81333 -14.000002,13.81333 L 15,299 c -7.756,0 -14,0 -14,0 L 1,164.81334 C 1,157.16075 7.244,151 15,151 z"
      style="fill:#e0e1f3;fill-opacity:1;stroke:#e0e1f3;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     sodipodi:nodetypes="ccccccccc"
+     id="path2973"
+     d="m 15,1 8.673729,0 c 7.756002,0 14.000002,6.16075 14.000002,13.81334 l 0,120.37333 c 0,7.65258 -6.244,13.81333 -14.000002,13.81333 L 15,149 c -7.756,0 -14,0 -14,0 L 1,14.81334 C 1,7.16075 7.244,1 15,1 z"
+     style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
 </svg>

Modified: trunk/public/images/secondary_tabs_background_right.png
===================================================================
(Binary files differ)

Modified: trunk/public/images/secondary_tabs_background_right.svg
===================================================================
--- trunk/public/images/secondary_tabs_background_right.svg	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/images/secondary_tabs_background_right.svg	2010-06-13 18:28:47 UTC (rev 1724)
@@ -13,7 +13,7 @@
    version="1.1"
    inkscape:version="0.47 r22583"
    width="415"
-   height="300"
+   height="450"
    sodipodi:docname="secondary_tabs_background_right.svg"
    inkscape:export-filename="/home/wybo/logilogi/trunk/public/images/secondary_tabs_background_right.png"
    inkscape:export-xdpi="90"
@@ -67,23 +67,30 @@
      inkscape:window-height="719"
      id="namedview5550"
      showgrid="false"
-     inkscape:zoom="2.2250293"
-     inkscape:cx="207.5"
-     inkscape:cy="159.48185"
+     inkscape:zoom="1.1125147"
+     inkscape:cx="430.53301"
+     inkscape:cy="269.01433"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg5548" />
   <path
-     style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2.00837374000000013;stroke-miterlimit:4;stroke-opacity:1"
-     d="m 14.981398,1.0041909 386.037622,0 c 7.74326,0 13.977,6.222664 13.977,13.9521601 l 0,134.039459 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -386.037622,0 c -7.7432607,-2e-4 -13.9772112,0.004 -13.9772112,0.004 l 2.1e-4,-134.039459 c 0,-7.7294961 6.2337405,-13.9521601 13.9770012,-13.9521601 z"
+     style="fill:#999dd7;fill-opacity:1;stroke:#999dd7;stroke-width:2.00837374;stroke-miterlimit:4;stroke-opacity:1"
+     d="m 14.981398,1.0041931 386.037622,0 c 7.74326,0 13.977,6.22266 13.977,13.9521599 l 0,134.039457 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -386.037622,0 c -7.7432607,-2e-4 -13.9772112,0.004 -13.9772112,0.004 l 2.1e-4,-134.039457 c 0,-7.7294999 6.2337405,-13.9521599 13.9770012,-13.9521599 z"
      id="rect4929"
      sodipodi:nodetypes="ccccccccc"
      inkscape:export-xdpi="90"
      inkscape:export-ydpi="90" />
   <path
-     style="fill:#e0e1f3;fill-opacity:1;stroke:#e0e1f3;stroke-width:2.00837374000000013;stroke-miterlimit:4;stroke-opacity:1"
+     style="fill:#e0e1f3;fill-opacity:1;stroke:#e0e1f3;stroke-width:2.00837374;stroke-miterlimit:4;stroke-opacity:1"
      d="m 14.981397,151.00419 386.037623,0 c 7.74326,0 13.977,6.22266 13.977,13.95216 l 0,134.03946 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -386.037623,0 c -7.7432601,-2e-4 -13.9772101,0.004 -13.9772101,0.004 l 2.1e-4,-134.03946 c 0,-7.7295 6.23374,-13.95216 13.9770001,-13.95216 z"
      id="rect4929-9"
      sodipodi:nodetypes="ccccccccc" />
+  <path
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     sodipodi:nodetypes="ccccccccc"
+     id="path5709"
+     d="m 14.981398,301.0042 386.037622,0 c 7.74326,0 13.977,6.22266 13.977,13.95216 l 0,134.03945 c 0,0 -6.23374,-0.004 -13.977,-0.004 l -386.037622,0 c -7.7432607,-2e-4 -13.9772112,0.004 -13.9772112,0.004 l 2.1e-4,-134.03945 c 0,-7.7295 6.2337405,-13.95216 13.9770012,-13.95216 z"
+     style="fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2.00837374000000013;stroke-miterlimit:4;stroke-opacity:1" />
 </svg>

Modified: trunk/public/javascripts/application.js
===================================================================
--- trunk/public/javascripts/application.js	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/javascripts/application.js	2010-06-13 18:28:47 UTC (rev 1724)
@@ -509,9 +509,3 @@
     }
   });
 }
-
-// For browsing
-
-function focusBrowseListInput() {
-  $('browse_list_input').focus();
-}

Modified: trunk/public/javascripts/taglist.js
===================================================================
--- trunk/public/javascripts/taglist.js	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/javascripts/taglist.js	2010-06-13 18:28:47 UTC (rev 1724)
@@ -17,7 +17,7 @@
   // Constructors
   
   initialize: function(list_id, url, param_name, replace_string,
-      invalid_msg, reserved_msg, replace_pre) {
+      invalid_msg, reserved_msg, replace_pre, logi_string) {
     this.list_id = list_id;
     this.list = $(list_id);
     this.add_field = $(list_id + '_input');
@@ -27,6 +27,7 @@
     this.invalid_msg = invalid_msg;
     this.reserved_msg = reserved_msg;
     this.replace_pre = replace_pre;
+    this.logi_string = logi_string;
     this.replace_string = this.empty_default(replace_string);
     this.empty_string = this.replace_string;
     this.register_button();
@@ -152,11 +153,25 @@
       new Ajax.Request(this.url, {
           asynchronous: true, evalScripts: true, method: 'get', 
           parameters: this.param_name + '=' + 
-              this.hidden_tags_string()}); 
+              this.submit_string()}); 
           return false;
     }
   },
 
+  submit_string: function() {
+    if (this.logi_string != null) {
+      return this.tags_string() + '/' + this.logi_string
+    } else {
+      return this.tags_string()
+    }
+  },
+
+  // Focusing
+
+  focus: function() {
+    this.add_field.focus();
+  },
+
   // Rendering
 
   render_replace_pre: function() {

Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/public/stylesheets/logilogi.css	2010-06-13 18:28:47 UTC (rev 1724)
@@ -337,8 +337,16 @@
 .panel_tabs li:hover a {
   background-position: 100% 0px;
 }
+.panel_tabs li.disabled {
+  background-position: 0 -300px;
+}
+.panel_tabs li.disabled a,
+.panel_tabs li.disabled span {
+  background-position: 100% -300px;
+  color: #c8c8c8;
+}
 .panel_tabs li.disabled:hover {
-  background-position: 0 -150px;
+  background-position: 0 -300px;
 }
 .panel_tabs ul {
   margin: 0;
@@ -631,7 +639,8 @@
   margin: 0 5px;
   padding: 0 0 0 15px;
 }
-#primarytabs a {
+#primarytabs a,
+#primarytabs span {
   float: left;
   display: block;
   width: 0.1em;
@@ -643,11 +652,13 @@
   font-size: 1.5em;
   margin: 0 0 0 -2px;
 }
-#primarytabs > ul a {
+#primarytabs > ul a,
+#primarytabs > ul span {
   width: auto; 
 }
 /* Commented Backslash Hack hides rule from IE5-Mac \*/
-#primarytabs a {
+#primarytabs a,
+#primarytabs span {
   float: none; 
 }
 /* End IE5-Mac hack */
@@ -658,6 +669,7 @@
 #logis_index #primarytabs_search,
 #logis_show #primarytabs_view, 
 #logis_new #primarytabs_new, 
+#logis_edit #primarytabs_edit, 
 .changes #primarytabs_changes, 
 #users_index #primarytabs_users {
   background-position: 0 -150px;
@@ -665,16 +677,28 @@
 #logis_index #primarytabs_search a,
 #logis_show #primarytabs_view a,
 #logis_new #primarytabs_new a,
+#logis_edit #primarytabs_edit a,
 .changes #primarytabs_changes a, 
 #users_index #primarytabs_users a {
   background-position: 100% -150px;
   padding-bottom: 3px;
   color: #181c57;
 }
+#primarytabs li.disabled {
+  background-position: 0 -450px;
+}
+#primarytabs li.disabled span {
+  background-position: 100% -450px;
+  padding-bottom: 3px;
+  color: #c8c8c8;
+}
 
-#primarytabs li:hover, #primarytabs li:hover a {
-  background-position: 0% -150px;
+#primarytabs li:hover {
+  background-position: 0 -150px;
 }
+#primarytabs li.disabled:hover {
+  background-position: 0 -450px;
+}
 #primarytabs li:hover a {
   background-position: 100% -150px;
 }
@@ -841,7 +865,7 @@
   font-size: 1.9em;
 }
 .equal_author {
-  margin-top: 0.5em;
+  margin-top: 0.65em;
   line-height: 1.3em;
   font-size: 1.6em;
 }
@@ -912,7 +936,7 @@
 #contending_logis .browse_all {
   float: right;
   padding-top: 0;
-  margin: -1.5em 0em 1em 0em;
+  margin: 0em 0em 1em 0em;
 }
 #contending_logis .browse_all .p {
   padding-top: 0;

Modified: trunk/test/unit/context_test.rb
===================================================================
--- trunk/test/unit/context_test.rb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/test/unit/context_test.rb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -22,7 +22,7 @@
     c = Context.new('Logi_Logi/Botanics')
     # that is resolved
     assert_equal [Tag.from_s('Logi_Logi')], c.link.received_tags
-    assert_equal nil, c.query
+    assert_equal "Logi_Logi AND Botanics", c.query
   end
 
   def test_initialize_force

Modified: trunk/test/unit/link_test.rb
===================================================================
--- trunk/test/unit/link_test.rb	2010-06-10 20:44:33 UTC (rev 1723)
+++ trunk/test/unit/link_test.rb	2010-06-13 18:28:47 UTC (rev 1724)
@@ -326,6 +326,20 @@
         l.received_tags[0]
     assert_equal Tag.from_s('Nederland'),
         l.received_tags[1]
+    assert_equal nil, l.volatile_to_logi
+    assert_equal [], l.volatile_to_logis
+
+    # to_logi but different tag-combo
+    botanics = logis(:botanics)
+    l2 = Link.new_from_s('Logi_Logi/Nederland' + botanics.to_s)
+    l2.resolve(:force => true)
+
+    assert_equal Tag.from_s('Logi_Logi'),
+        l2.received_tags[0]
+    assert_equal Tag.from_s('Nederland'),
+        l2.received_tags[1]
+    assert_equal botanics, l2.volatile_to_logi
+    assert l2.volatile_to_logis.detect_by_id(botanics.id)
   end
 
   def test_resolve_twice


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