[Logilogi-svn] SF.net SVN: logilogi:[1722] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1722] trunk
|
From: <wy...@us...> - 2010-06-08 10:26:25
|
Revision: 1722
http://logilogi.svn.sourceforge.net/logilogi/?rev=1722&view=rev
Author: wybow
Date: 2010-06-08 10:26:16 +0000 (Tue, 08 Jun 2010)
Log Message:
-----------
Finished DBR improved main-page, still need to do new and users
Modified Paths:
--------------
trunk/app/controllers/application_controller.rb
trunk/app/controllers/logis_controller.rb
trunk/app/helpers/application_helper.rb
trunk/app/models/context.rb
trunk/app/views/annotations/edit.html.erb
trunk/app/views/external_links/edit.html.erb
trunk/app/views/layouts/_head.html.erb
trunk/app/views/layouts/_header.html.erb
trunk/app/views/links/edit.html.erb
trunk/app/views/logis/_cloud.html.erb
trunk/app/views/logis/_found_logis.html.erb
trunk/app/views/logis/_incoming_links.html.erb
trunk/app/views/logis/_navigation_bar_browse_header.html.erb
trunk/app/views/logis/_navigation_bar_view_header.html.erb
trunk/app/views/logis/_new_logis.html.erb
trunk/app/views/logis/_snippets_list.html.erb
trunk/app/views/logis/_tag_list.html.erb
trunk/app/views/logis/_tag_sets_list.html.erb
trunk/app/views/logis/index.html.erb
trunk/app/views/logis/index.js.rjs
trunk/app/views/remarks/edit.html.erb
trunk/config/locales/en.yml
trunk/config/routes.rb
trunk/public/do/magick_corners/image.400.36.mirrored_notice_cloud.svg.10.south_west.png
trunk/public/do/magick_corners/image.400.36.notice_cloud.svg.10.south_east.png
trunk/public/do/magick_corners/image.486.400.popover_cloud.svg.42.north_west.png
trunk/public/do/magick_corners/image.490.400.logi_current.svg.32.north_west.png
trunk/public/do/magick_corners/scaled_image.23.height.add_tag.svg.png
trunk/public/do/magick_corners/scaled_image.23.height.link_tag.svg.png
trunk/public/do/magick_corners/scaled_image.24.height.link_tag.svg.png
trunk/public/do/magick_corners/scaled_image.27.height.remove_tag.svg.png
trunk/public/do/magick_corners/scaled_image.30.height.author_tag.svg.png
trunk/public/do/magick_corners/scaled_image.30.height.link_tag.svg.png
trunk/public/do/magick_corners/scaled_image.30.height.remove_tag.svg.png
trunk/public/images/add_tag.svg
trunk/public/images/author_tag.svg
trunk/public/images/link_tag.svg
trunk/public/images/logo.png
trunk/public/images/remove_tag.svg
trunk/public/images/svgs/logo.svg
trunk/public/javascripts/taglist.js
trunk/public/stylesheets/logilogi.css
trunk/test/unit/context_test.rb
Added Paths:
-----------
trunk/app/views/layouts/_tabs.html.erb
trunk/app/views/logis/_add_tag_button.html.erb
trunk/app/views/logis/_clear_button.html.erb
trunk/app/views/logis/_found_full_text_logis.html.erb
trunk/public/images/logo.svg
trunk/public/javascripts/blank.html
trunk/public/javascripts/rsh.js
Modified: trunk/app/controllers/application_controller.rb
===================================================================
--- trunk/app/controllers/application_controller.rb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/controllers/application_controller.rb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -636,15 +636,15 @@
# Resolves the current context.
#
def resolve_context
- if params[:new_ll_link_string]
- params[:ll_link_string] = params[:new_ll_link_string]
+ if params[:top_ll_link_string]
+ params[:ll_link_string] = params[:top_ll_link_string].gsub(' ','/')
end
+ params[:ll_link_string] = params[:new_ll_link_string] if params[:new_ll_link_string]
if params[:ll_link_string] and !params[:ll_link_string].empty?
context_link_string = params[:ll_link_string]
end
if context_link_string
- self.current_context = Context.new(
- Link.new_from_s(context_link_string),
+ self.current_context = Context.new(context_link_string,
:force => params[:force])
else
self.current_context = nil
Modified: trunk/app/controllers/logis_controller.rb
===================================================================
--- trunk/app/controllers/logis_controller.rb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/controllers/logis_controller.rb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -63,7 +63,16 @@
respond_to do |format|
format.html
format.js do
- render :template => 'logis/index.js.rjs'
+ if params[:full_text_search]
+ self.get_found_full_text_logis
+ render :partial => 'found_full_text_logis'
+ else
+ @primary_tabs = render_to_string(:partial => 'layouts/tabs')
+ @add_tag_button = render_to_string(:partial => 'add_tag_button',
+ :locals => {:name => 'browse_list'})
+ @clear_button = render_to_string(:partial => 'clear_button')
+ render :template => 'logis/index.js.rjs'
+ end
end
format.xml do
if current_context.nil?
@@ -313,12 +322,39 @@
@exact_matching_logis = current_context.exact_matching_logis
@sloppy_matching_logis = current_context.sloppy_matching_logis
@reduced_matching_logis = current_context.reduced_matching_logis
+ if !current_context.any_match?
+ self.get_found_full_text_logis
+ else
+ @full_text_logis = nil
+ end
+ true
end
end
+ def get_found_full_text_logis
+ @full_text_logis = WillPaginate::Collection.create(
+ (params[:page] || 1), 8) do |pager|
+ search = ActsAsXapian::Search.new([Logi], current_context.query,
+ :offset => pager.offset, :limit => pager.per_page)
+ # inject the result array into the paginated collection:
+ pager.replace(search.results.collect {|r| r[:model]})
+
+ unless pager.total_entries
+ # the pager didn't manage to guess the total count, do it manually
+ pager.total_entries = search.matches_estimated
+ end
+ end
+ end
+
def tag_sets
if !current_context.nil?
- @tag_set_links = self.current_context.tag_set_links
+ if current_context.any_match?
+ @tag_set_links = current_context.tag_set_links
+ else
+ # MAYDO: Can be optimized by special TagSet class in search index
+ @tag_set_links = Context.extract_tag_set_links(
+ LogiLogiXapian.search([Logi], current_context.query))
+ end
end
end
Modified: trunk/app/helpers/application_helper.rb
===================================================================
--- trunk/app/helpers/application_helper.rb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/helpers/application_helper.rb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -152,6 +152,10 @@
return tabs
end
+ def add_simple_history(name, tags_string)
+ page << %[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",
@@ -423,7 +427,8 @@
tag.to_s(:for => :show) + '\'); ' +
tag_list_js_name + '.submit()'
return '<div class="floated_rounded_wrapper">' + link_to_js_rounded(
- tag.to_s(:for => :show), js, 'tag cloud_tag icon_tag add_tag ' +
+ tag.to_s(:for => :show), js, 'tag cloud_tag ' +
+ (current_context.nil? ? 'link_tag' : 'add_tag icon_tag') + ' ' +
css_class) + '</div>'
end
Modified: trunk/app/models/context.rb
===================================================================
--- trunk/app/models/context.rb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/models/context.rb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -22,8 +22,8 @@
###### Relationships
- attr_accessor :force
- attr_reader :link, :context_link
+ attr_accessor :force, :query
+ attr_reader :link, :query, :context_link
###### Caches
@@ -35,9 +35,10 @@
# Sets the link, required as an option.
#
- def initialize(link, options = {})
+ def initialize(query_string, options = {})
self.force = options[:force]
- self.link = link
+ self.link = Link.new_from_s(query_string.dup)
+ self.query = query_string
return self
end
@@ -70,6 +71,18 @@
reset_methods_cache
end
+ # Query setter, requires link to be set.
+ #
+ def query=(query_string)
+ @query = query_string.split('/').join(' AND ')
+ end
+
+ # Formats the query for passing on in urls.
+ #
+ def query_for_url
+ return @query.split(' AND ').join('/')
+ end
+
### Tag sets
# Returns the tag-sets for which logis are found
@@ -138,6 +151,12 @@
end
end
+ # Returns true if there is any match.
+ #
+ def any_match?
+ return !self.context_link.volatile_all_logis.empty?
+ end
+
# Cached.
#
def contending_logis
Modified: trunk/app/views/annotations/edit.html.erb
===================================================================
--- trunk/app/views/annotations/edit.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/annotations/edit.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -18,10 +18,12 @@
<% render :layout => 'application/panel' do %>
<div class="min_height"></div>
<label><%= t 'defaults.list_label' %></label><br /><br />
- <ul id="available_list" class="remove_list">
- <% if @annotations.empty? %>
- <li><i><%= t 'defaults.none' %></i></li>
- <% else %>
+ <% if @annotations.empty? %>
+ <p class="one_line">
+ <i><%= t 'defaults.none' %></i>
+ </p>
+ <% else %>
+ <ul id="available_list" class="remove_list">
<% @annotations.order_by_created_at.each do |annotation| %>
<li id="r_<%= annotation.id.to_s %>">
<a href="javascript:logiInsertsRemove('<%= annotation.id.to_s %>',
@@ -35,8 +37,8 @@
<%= user_ll_link(annotation.user) %>
</li>
<% end %>
- <% end %>
- </ul>
+ </ul>
+ <% end %>
<% end %>
</div>
Modified: trunk/app/views/external_links/edit.html.erb
===================================================================
--- trunk/app/views/external_links/edit.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/external_links/edit.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -17,10 +17,12 @@
<% render :layout => 'application/panel' do %>
<div class="min_height"></div>
<label><%= t 'defaults.list_label' %></label><br /><br />
- <ul id="available_list" class="remove_list">
- <% if @external_links.empty? %>
- <li><i><%= t 'defaults.none' %></i></li>
- <% else %>
+ <% if @external_links.empty? %>
+ <p class="one_line">
+ <i><%= t 'defaults.none' %></i>
+ </p>
+ <% else %>
+ <ul id="available_list" class="remove_list">
<% @external_links.order_by_created_at.each do |external_link| %>
<li id="r_<%= external_link.id.to_s %>">
<a href="javascript:logiInsertsRemove('<%= external_link.id.to_s %>',
@@ -34,8 +36,8 @@
<%= user_ll_link(external_link.user) %>
</li>
<% end %>
- <% end %>
- </ul>
+ </ul>
+ <% end %>
<% end %>
</div>
Modified: trunk/app/views/layouts/_head.html.erb
===================================================================
--- trunk/app/views/layouts/_head.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/layouts/_head.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -14,7 +14,7 @@
<%= javascript_include_tag "tiny_mce/tiny_mce" %>
<%
javascripts = ["shortcut", :defaults, "dropdowntabs", "taglist",
- "body_inserter", "magick_corners", "custom-form-elements", "tab"]
+ "body_inserter", "magick_corners", "custom-form-elements", "tab", "rsh"]
if GlobalConfig.custom_js and !GlobalConfig.custom_js.empty?
javascripts.push(GlobalConfig.custom_js)
end
Modified: trunk/app/views/layouts/_header.html.erb
===================================================================
--- trunk/app/views/layouts/_header.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/layouts/_header.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -33,10 +33,12 @@
</div>
</div>
<div id="top_search">
- <% form_for(:search, nil, :url => searches_url()) do |form| %>
- <%= form.text_field :query, :name => :query, :value => @query,
+ <% form_for(:search, nil, :url => browse_logis_url(:ll_link_string => ''),
+ :html => {:method => :get}) do |form| %>
+ <%= form.text_field :ll_link_string, :name => :top_ll_link_string, :value => @query,
:no_label => true, :id => 'top_search_query' %>
- <%= form.submit t('v.searches.search'), :id => 'top_search_button' %>
+ <%= form.submit t('v.searches.search'), :id => 'top_search_button',
+ :class => 'go_button' %>
<% end %>
</div>
<div id="sessions">
@@ -50,15 +52,7 @@
<% end %>
</div>
<% if !local_assigns[:tabs_disabled] %>
- <div id="primarytabs">
- <ul>
- <li id="primarytabs_main"><%= link_to t('v.layouts.main'), root_url %></li>
- <li id="primarytabs_logis"><%= link_to t('v.layouts.topics_and_logis'), browse_logis_url(:ll_link_string => nil) %></li>
- <li id="primarytabs_changes"><%= link_to t('v.layouts.changes'), changes_url %></li>
-<!-- <li id="primarytabs_groups"><%= link_to t('v.layouts.groups'), peer_groups_url %></li> -->
- <li id="primarytabs_users"><%= link_to t('v.layouts.users'), users_url %></li>
- </ul>
- </div>
+ <%= render :partial => 'layouts/tabs' %>
<% end %>
<div class="spacer"></div>
</div>
Added: trunk/app/views/layouts/_tabs.html.erb
===================================================================
--- trunk/app/views/layouts/_tabs.html.erb (rev 0)
+++ trunk/app/views/layouts/_tabs.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -0,0 +1,19 @@
+<div id="primarytabs">
+ <%
+if current_context.nil?
+ search_u = root_url
+ 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)
+end
+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_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>
+ </ul>
+</div>
Modified: trunk/app/views/links/edit.html.erb
===================================================================
--- trunk/app/views/links/edit.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/links/edit.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -17,10 +17,12 @@
<% render :layout => 'application/panel' do %>
<div class="min_height"></div>
<label><%= t 'defaults.list_label' %></label><br /><br />
- <ul id="available_list" class="remove_list">
- <% if @links.empty? %>
- <li><i><%= t 'defaults.none' %></i></li>
- <% else %>
+ <% if @links.empty? %>
+ <p class="one_line">
+ <i><%= t 'defaults.none' %></i>
+ </p>
+ <% else %>
+ <ul id="available_list" class="remove_list">
<% @links.order_by_created_at.each do |link| %>
<li id="r_<%= link.id.to_s %>">
<a href="javascript:logiInsertsRemove('<%= link.id.to_s %>',
@@ -33,8 +35,8 @@
:length => 30), :link => link) %> - <%= user_ll_link(link.user) %>
</li>
<% end %>
- <% end %>
- </ul>
+ </ul>
+ <% end %>
<% end %>
</div>
Added: trunk/app/views/logis/_add_tag_button.html.erb
===================================================================
--- trunk/app/views/logis/_add_tag_button.html.erb (rev 0)
+++ trunk/app/views/logis/_add_tag_button.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -0,0 +1,5 @@
+<%= button_to_function (current_context.nil? ? t('v.logis.search_word_or_tag') : t('v.logis.add_tag')),
+ (name + '.add_tag_from_field(); ' + name + ".submit();" +
+ (local_assigns[:no_focus] ? '' :
+ " $('" + name + "_input').focus();")),
+ :class => (current_context.nil? ? 'go_button' : 'add_button') + ' tag_list', :tabindex => 99 %>
Added: trunk/app/views/logis/_clear_button.html.erb
===================================================================
--- trunk/app/views/logis/_clear_button.html.erb (rev 0)
+++ trunk/app/views/logis/_clear_button.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -0,0 +1,5 @@
+<% if !current_context.nil? %>
+<%= button_to_function t('v.logis.clear_query'),
+ 'browse_list.remove_all_tags(); browse_list.submit()',
+ :class => 'cancel_button' %>
+<% end %>
Modified: trunk/app/views/logis/_cloud.html.erb
===================================================================
--- trunk/app/views/logis/_cloud.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_cloud.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -9,7 +9,9 @@
<%= link_to_suggested_cloud_tag(used_tag.tag, css_class, 'browse_list') %>
<% end %>
<% else %>
- <i><%= t 'v.logis.no_tags_below' %></i>
+ <p>
+ <i><%= t 'v.logis.no_tags_below' %></i>
+ </p>
<% end %>
<div class="spacer"></div>
<% end %>
Added: trunk/app/views/logis/_found_full_text_logis.html.erb
===================================================================
--- trunk/app/views/logis/_found_full_text_logis.html.erb (rev 0)
+++ trunk/app/views/logis/_found_full_text_logis.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -0,0 +1,32 @@
+<div id="found_full_text_logis">
+ <% if @full_text_logis.nil? %>
+ <% render :layout => 'application/panel', :locals => {:id => "do_search"} do %>
+ <p>
+ <%= t('v.logis.full_text_not_done', :query => current_context.query) %>
+ </p>
+ <%= button_to_remote t('v.logis.full_text_search'), {
+ :update => "found_full_text_logis", :url => browse_logis_url(
+ :ll_link_string => current_context.query_for_url,
+ :full_text_search => true),
+ :method => :get},
+ :class => 'go_button', :tabindex => 3 %>
+ <% end %>
+ <% elsif !@full_text_logis.empty? %>
+ <% render :layout => 'application/panel', :locals => {:id => "exact_matches"} do %>
+ <p class="one_line">
+ <%= t('v.searches.count_same_tags',
+ :count => @full_text_logis.size, :query => current_context.query) %>
+ </p>
+ <% end %>
+ <%= render :partial => 'logis/snippets_list', :locals => {:logis => @full_text_logis} %>
+ <% else %>
+ <% render :layout => 'application/panel', :locals => {:id => "pick_a_tag"} do %>
+ <p>
+ <%= t('v.logis.full_text_no_results', :query => current_context.query) %>
+ </p>
+ <% end %>
+ <% end %>
+ <% javascript_tag do -%>
+ mcorners.run();
+ <% end -%>
+</div>
Modified: trunk/app/views/logis/_found_logis.html.erb
===================================================================
--- trunk/app/views/logis/_found_logis.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_found_logis.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,57 +1,50 @@
<div id="found_logis">
- <% if !current_context.nil? %>
- <% if current_context.link.unreduced_match? %>
- <% if !@exact_matching_logis.empty? %>
- <% render :layout => 'application/panel',
- :locals => {:id => "exact_matches"} do %>
- <p>
- <%= t 'v.logis.count_exact_matches',
- :count => @exact_matching_logis.size %>
- </p>
- <% end %>
- <%= render :partial => 'snippets_list',
- :locals => {:logis => @exact_matching_logis} %>
+ <% if current_context.link.unreduced_match? %>
+ <% if !@exact_matching_logis.empty? %>
+ <% render :layout => 'application/panel',
+ :locals => {:id => "exact_matches"} do %>
+ <p class="one_line">
+ <%= t 'v.logis.count_exact_matches',
+ :count => @exact_matching_logis.size %>
+ </p>
<% end %>
+ <%= render :partial => 'snippets_list',
+ :locals => {:logis => @exact_matching_logis} %>
+ <% end %>
- <% if !@sloppy_matching_logis.empty? %>
- <% render :layout => 'application/panel',
- :locals => {:id => "sloppy_matches"} do %>
- <p>
- <%= t 'v.logis.count_sloppy_matches',
- :count => @sloppy_matching_logis.size %>
- </p>
- <% end %>
- <%= render :partial => 'snippets_list',
- :locals => {:logis => @sloppy_matching_logis} %>
- <% end %>
- <% else %>
+ <% if !@sloppy_matching_logis.empty? %>
<% render :layout => 'application/panel',
- :locals => {:id => "no_matches_for_tags"} do %>
- <p><%= t 'v.logis.no_matches' %></p>
- <div class="notice_cloud"><%= t 'v.logis.find_next_time' %></div>
- <%= new_logi_button t 'v.logis.new_for_tags' %>
+ :locals => {:id => "sloppy_matches"} do %>
+ <p class="one_line">
+ <%= t 'v.logis.count_sloppy_matches',
+ :count => @sloppy_matching_logis.size %>
+ </p>
<% end %>
-
- <% if !@reduced_matching_logis.empty? %>
- <% render :layout => 'application/panel',
- :locals => {:id => "exact_matches"} do %>
- <p><%= t('v.logis.count_reduced_matches',
- :count => @reduced_matching_logis.size) %></p>
- <%= browse_ll_link(current_context.link, :direction => :received) %>
- <% end %>
- <%= render :partial => 'snippets_list',
- :locals => {:logis => @reduced_matching_logis} %>
- <% end %>
+ <%= render :partial => 'snippets_list',
+ :locals => {:logis => @sloppy_matching_logis} %>
<% end %>
<% else %>
<% render :layout => 'application/panel',
- :locals => {:id => "pick_a_tag"} do %>
+ :locals => {:id => "no_matches_for_tags"} do %>
<p>
- <%= t 'v.logis.newest_by_rating' %><br />
- <%= t 'v.logis.pick_a_tag' %>
+ <i><%= t 'v.logis.no_matches' %></i>
</p>
+ <div class="notice_cloud"><%= t 'v.logis.find_next_time' %></div>
+ <%= new_logi_button t 'v.logis.new_for_tags' %>
<% end %>
- <%= render :partial => 'snippets_list',
- :locals => {:logis => @all_logis} %>
+
+ <% if !@reduced_matching_logis.empty? %>
+ <% render :layout => 'application/panel',
+ :locals => {:id => "exact_matches"} do %>
+ <p>
+ <%= t('v.logis.count_reduced_matches',
+ :count => @reduced_matching_logis.size) %>
+ </p>
+ <%= browse_ll_link(current_context.link, :direction => :received) %>
+ <% end %>
+ <%= render :partial => 'snippets_list',
+ :locals => {:logis => @reduced_matching_logis} %>
+ <% end %>
<% end %>
+ <%= render :partial => 'found_full_text_logis' %>
</div>
Modified: trunk/app/views/logis/_incoming_links.html.erb
===================================================================
--- trunk/app/views/logis/_incoming_links.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_incoming_links.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,7 +1,9 @@
-<ol class="links">
- <% if incoming_links.empty? %>
- <li><i><%= t 'defaults.none' %></i></li>
- <% else %>
+<% if incoming_links.empty? %>
+ <p class="one_line">
+ <i><%= t 'defaults.none' %></i>
+ </p>
+<% else %>
+ <ol class="links">
<% incoming_links.collect {|l| l.from_logi}.group_by {|e|
e.link.to_s(:step => -1)}.each do |link_string, same_context_logis| %>
<li><%= browse_ll_link(same_context_logis.first.link, {}, :length => 70) %>
@@ -12,5 +14,5 @@
</ul>
</li>
<% end %>
- <% end %>
-</ol>
+ </ol>
+<% end %>
Modified: trunk/app/views/logis/_navigation_bar_browse_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_browse_header.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_navigation_bar_browse_header.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,10 +1,10 @@
-<%= button_to_function t('v.logis.clear_query'),
- 'browse_list.remove_all_tags(); browse_list.submit()',
- :class => 'cancel_button' %>
+<div id="clear_button_space">
+ <%= render :partial => 'clear_button' %>
+</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} %>
+ :no_focus => true, :replace_pre => true} %>
<div class="spacer"></div>
Modified: trunk/app/views/logis/_navigation_bar_view_header.html.erb
===================================================================
--- trunk/app/views/logis/_navigation_bar_view_header.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_navigation_bar_view_header.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,7 +1,6 @@
<%= button_to t('v.logis.back_browse'), browse_logis_url(),
:class => 'back_button' %>
-<div class="spacer"></div>
-<div class="tags_container transparent_corner">
+<div class="tags_container">
<% link = current_context.link %>
<% tags = link.requested_tags %>
<%= link_to_navigation_tag(
@@ -23,5 +22,5 @@
link.volatile_to_logi.to_s(:for => :full_show),
ll_url(link, :spec_step => :logi)) %>
<% end %>
- <div class="spacer"></div>
</div>
+<div class="spacer"></div>
Modified: trunk/app/views/logis/_new_logis.html.erb
===================================================================
--- trunk/app/views/logis/_new_logis.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_new_logis.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,7 +1,7 @@
<% render :layout => 'application/panel_with_header',
:locals => {:title => t('v.main_page.logis_just'),
:id => "recenting"} do %>
- <p>
+ <p class="one_line">
<%= link_to t('v.main_page.view_all_new_logis'),
changes_url(:selected => :new_logis) %>
</p>
@@ -10,7 +10,7 @@
:locals => {:logis => @logis} %>
<% render :layout => 'application/panel',
:locals => {:id => "view_all"} do %>
- <p>
+ <p class="one_line">
<%= link_to t('v.main_page.view_all_new_logis'),
changes_url(:selected => :new_logis) %>
</p>
Modified: trunk/app/views/logis/_snippets_list.html.erb
===================================================================
--- trunk/app/views/logis/_snippets_list.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_snippets_list.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,5 +1,9 @@
<% if logis.empty? %>
- <center><i><%= t 'defaults.none' %></i></center>
+ <center>
+ <p class="one_line">
+ <i><%= t 'defaults.none' %></i>
+ </p>
+ </center>
<% else %>
<% logis.each do |logi| %>
<%= render :partial => 'logis/snippet', :locals => {:logi => logi} %>
Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_tag_list.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,4 +1,4 @@
-<div id="<%= name %>" class="tags_container transparent_corner">
+<div id="<%= name %>" class="tags_container">
<!-- Filled via js -->
</div>
<% if !local_assigns[:without_spacer] %>
@@ -19,11 +19,10 @@
:url => used_tags_path(:format => :js), :method => :get,
:param_name => 'search', :update => 'tag_auto_complete',
:min_chars => 1 %>
- <%= button_to_function t('v.logis.add_tag'),
- (name + '.add_tag_from_field(); ' + name + ".submit();" +
- (local_assigns[:no_focus] ? '' :
- " $('" + name + "_input').focus();")),
- :class => 'add_button tag_list', :tabindex => 99 %>
+ <div id="add_tag_button_space">
+ <%= render :partial => 'logis/add_tag_button', :locals => {
+ :name => name} %>
+ </div>
</div>
<% if !local_assigns[:without_form] %>
<%= end_form_tag() %>
@@ -35,5 +34,6 @@
'<%= (local_assigns[:replace_string] ? local_assigns[:replace_string] :
Tag.replace.to_s(:for => :show)) %>',
"<%= t('defaults.error_tag_invalid_string') %>",
- "<%= t('defaults.error_tag_reserved_words') %>");
+ "<%= t('defaults.error_tag_reserved_words') %>",
+ <%= local_assigns[:replace_pre] ? "true" : "false" %>);
<% end %>
Modified: trunk/app/views/logis/_tag_sets_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_sets_list.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/_tag_sets_list.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,11 +1,13 @@
-<ol class="links">
- <% if tag_set_links.empty? %>
- <li><i><%= t 'defaults.none' %></i></li>
- <% else %>
+<% if tag_set_links.empty? %>
+ <p class="one_line">
+ <i><%= t 'defaults.none' %></i>
+ </p>
+<% else %>
+ <ol class="links">
<% tag_set_links.each do |link| %>
<li>
<%= browse_ll_link(link) %>
</li>
<% end %>
- <% end %>
-</ol>
+ </ol>
+<% end %>
Modified: trunk/app/views/logis/index.html.erb
===================================================================
--- trunk/app/views/logis/index.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/index.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,4 +1,28 @@
<%# all is included via bodies for ajax #%>
+<% 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();")
+ }
+ <% end -%>
+<% end %>
<div id="main_body">
<%= yield :main_body %>
</div>
Modified: trunk/app/views/logis/index.js.rjs
===================================================================
--- trunk/app/views/logis/index.js.rjs 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/logis/index.js.rjs 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,3 +1,6 @@
+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")
@@ -2 +5,6 @@
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
Modified: trunk/app/views/remarks/edit.html.erb
===================================================================
--- trunk/app/views/remarks/edit.html.erb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/app/views/remarks/edit.html.erb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -18,10 +18,12 @@
<% render :layout => 'application/panel' do %>
<div class="min_height"></div>
<label><%= _('defaults.list') %></label><br /><br />
- <ul id="available_list" class="remove_list">
- <% if @remarks.empty? %>
- <li><i><%= _('defaults.none') %></i></li>
- <% else %>
+ <% if @remarks.empty? %>
+ <p class="one_line">
+ <i><%= _('defaults.none') %></i>
+ </p>
+ <% else %>
+ <ul id="available_list" class="remove_list">
<% @remarks.order_by_created_at.each do |remark| %>
<li id="r_<%= remark.id.to_s %>">
<a href="javascript:logiInsertsRemove('<%= remark.id.to_s %>', 'delete', 'undo');">
@@ -31,8 +33,8 @@
<%= user_ll_link(remark.user) %>
</li>
<% end %>
- <% end %>
- </ul>
+ </ul>
+ <% end %>
<% end %>
</div>
Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/config/locales/en.yml 2010-06-08 10:26:16 UTC (rev 1722)
@@ -594,6 +594,7 @@
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}}."
@@ -609,16 +610,17 @@
logi_logi_network_label: "Part of the LogiLogi Network:"
login: "Login"
logout: Logout
- main: "Main page"
means_available: "This means that the source code is {{link}}."
needs_javascript: "{{link}} needs Javascript enabled, and only works in {{firefox_open}}Firefox 3{{link_close}}, and in Internet Explorer 7."
+ new: New
preferences: Preferences
+ search: "Search"
second_version: "The second version of LogiLogi, now in public beta."
signup: "Signup for account"
title_line: "Philosophy on-line, discuss your ideas"
- topics_and_logis: "Tags & logis"
user_page: "User page"
users: Users
+ view: "View"
welcome: "Welcome {{name}}"
links:
are_you_sure: "Are you sure?"
@@ -678,12 +680,13 @@
want_browsed: "Want your logi to be browsed to?"
logis:
load_editor: "Expand reply editor"
- add_tag: "Add tag"
+ add_tag: "Add word or tag"
+ search_word_or_tag: "Search word or tag"
add_remark: "add comment"
are_positive:
one: ", {{count}} is positive"
other: ", {{count}} are positive"
- back_browse: "Back to browse"
+ back_browse: "Back to search"
back_view: "Back to view"
browse_all: "Browse all"
can_be_tagged: "It can be tagged by its author."
@@ -734,6 +737,9 @@
found_for_tag_sets: "Found logis for tag sets"
found_logi: "Found the logi."
found_more_matches: "More than three matches found, browse."
+ full_text_no_results: "No logis found for full text search \"{{query}}\"."
+ full_text_not_done: "Tags matched, no full text search done for \"{{query}}\"."
+ full_text_search: "Full text search"
has_different_tagset: "Logi has a different tag-set."
in_depth_response: "Want to give a more in-depth response?"
incoming_to_tags: "Incoming links to tags"
@@ -744,7 +750,7 @@
next: Next
next_on_path: "Next on read-path: {{link}}"
no_found: "No logis found."
- no_matches: "No matches found for the given tags."
+ no_matches: "No logis found with the given tags."
no_tags_below: "No tags below this set."
not_tagged: "This logi is not tagged."
peer_group_label: "Peergroup:"
@@ -755,7 +761,7 @@
read_on: "...read on"
recent_writings: "Recent writings"
recently_rated: "Recently positively rated"
- related_tags_suggested: "Related tags suggested for browsing"
+ related_tags_suggested: "Related tags suggested for browsing."
remark_to_author: "Short comment to author?"
remarks: Comments
select_edit: "Select whether you want to edit the text, or the settings."
@@ -878,11 +884,10 @@
remark: Comment
which: "Which comments?"
searches:
- back_browse: "Back to browse"
+ back_browse: "Back to search"
count_same_tags:
- one: "Found {{count}} match for \"{{query}}\"."
- other: "Found {{count}} matches for \"{{query}}\"."
- enter_query: "Enter a query and start searching."
+ one: "Found {{count}} logi for full text search \"{{query}}\"."
+ other: "Found {{count}} logis for full text search \"{{query}}\"."
search: Search
tags:
clear_all: "Clear all tags"
Modified: trunk/config/routes.rb
===================================================================
--- trunk/config/routes.rb 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/config/routes.rb 2010-06-08 10:26:16 UTC (rev 1722)
@@ -14,9 +14,9 @@
:requirements => {:js_file => /all/}
#map.root :controller => 'logis', :action => 'show', :ll_link_string => 'Logi_Logi'
- map.root :controller => 'main_page', :action => 'index'
+ map.root :controller => 'logis', :action => 'index'
map.formatted_root 'do.:format',
- :controller => 'main_page', :action => 'index'
+ :controller => 'logis', :action => 'index'
# For OpenID logins
map.resource :user_session,
Modified: trunk/public/do/magick_corners/image.400.36.mirrored_notice_cloud.svg.10.south_west.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/image.400.36.notice_cloud.svg.10.south_east.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/image.486.400.popover_cloud.svg.42.north_west.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/image.490.400.logi_current.svg.32.north_west.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.23.height.add_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.23.height.link_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.24.height.link_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.27.height.remove_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.30.height.author_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.30.height.link_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/do/magick_corners/scaled_image.30.height.remove_tag.svg.png
===================================================================
(Binary files differ)
Modified: trunk/public/images/add_tag.svg
===================================================================
--- trunk/public/images/add_tag.svg 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/public/images/add_tag.svg 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
height="40"
id="svg3408"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
version="1.0"
sodipodi:docname="add_tag.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -41,14 +42,15 @@
inkscape:pageshadow="2"
inkscape:zoom="1.979899"
inkscape:cx="208.95176"
- inkscape:cy="-141.20229"
+ inkscape:cy="0.21906533"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1270"
- inkscape:window-height="949"
+ inkscape:window-height="717"
inkscape:window-x="0"
- inkscape:window-y="21" />
+ inkscape:window-y="25"
+ inkscape:window-maximized="0" />
<metadata
id="metadata3413">
<rdf:RDF>
@@ -72,7 +74,7 @@
height="40"
width="400"
id="rect6887"
- style="fill:#9cbd86;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.0299999;stroke-opacity:1;display:inline" />
+ style="fill:#5f2f8a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline" />
<path
id="path3511"
d="M 382.56152,7.642422 L 382.56152,18.743601 L 393.67972,18.743601 L 393.67972,22.131588 L 382.56152,22.131588 L 382.56152,33.23221 L 379.20813,33.23221 L 379.20813,22.131588 L 368.08993,22.131588 L 368.08993,18.743601 L 379.20813,18.743601 L 379.20813,7.642422 L 382.56152,7.642422"
Modified: trunk/public/images/author_tag.svg
===================================================================
--- trunk/public/images/author_tag.svg 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/public/images/author_tag.svg 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
height="40"
id="svg3408"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
version="1.0"
sodipodi:docname="author_tag.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -46,9 +47,10 @@
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1279"
- inkscape:window-height="949"
- inkscape:window-x="1280"
- inkscape:window-y="25" />
+ inkscape:window-height="717"
+ inkscape:window-x="81"
+ inkscape:window-y="25"
+ inkscape:window-maximized="0" />
<metadata
id="metadata3413">
<rdf:RDF>
@@ -72,6 +74,6 @@
height="40"
width="400"
id="rect6887"
- style="fill:#e0e1f3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline" />
+ style="fill:#9cbd86;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline" />
</g>
</svg>
Modified: trunk/public/images/link_tag.svg
===================================================================
--- trunk/public/images/link_tag.svg 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/public/images/link_tag.svg 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
height="40"
id="svg3408"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
version="1.0"
sodipodi:docname="link_tag.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -46,9 +47,10 @@
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1279"
- inkscape:window-height="949"
- inkscape:window-x="1280"
- inkscape:window-y="25" />
+ inkscape:window-height="717"
+ inkscape:window-x="148"
+ inkscape:window-y="230"
+ inkscape:window-maximized="0" />
<metadata
id="metadata3413">
<rdf:RDF>
@@ -72,6 +74,6 @@
height="40"
width="400"
id="rect6887"
- style="fill:#9cbd86;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.0299999;stroke-opacity:1;display:inline" />
+ style="fill:#5f2f8a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline" />
</g>
</svg>
Modified: trunk/public/images/logo.png
===================================================================
(Binary files differ)
Added: trunk/public/images/logo.svg
===================================================================
--- trunk/public/images/logo.svg (rev 0)
+++ trunk/public/images/logo.svg 2010-06-08 10:26:16 UTC (rev 1722)
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="36"
+ height="52"
+ id="svg5147"
+ sodipodi:version="0.32"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="logo.svg"
+ inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo_affiliate.png"
+ inkscape:export-xdpi="36"
+ inkscape:export-ydpi="36"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0">
+ <defs
+ id="defs5149">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 300 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="750 : 300 : 1"
+ inkscape:persp3d-origin="375 : 200 : 1"
+ id="perspective4513" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="5.6568544"
+ inkscape:cx="61.844021"
+ inkscape:cy="20.541468"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ inkscape:window-width="1270"
+ inkscape:window-height="717"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ width="750px"
+ height="600px"
+ showgrid="false"
+ inkscape:window-maximized="0" />
+ <metadata
+ id="metadata5152">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-548)">
+ <path
+ style="fill:#989cd7;fill-opacity:1;stroke:#989cd7;stroke-width:0.10939746;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 27.878123,599.88737 c 0.135586,-0.68984 -7.077072,-2.38437 -10.823014,-3.21371 -3.856237,-0.85374 -3.901611,-0.8575 -5.891603,-1.21231 -2.2523579,-0.40163 -3.5336983,-0.62923 -4.6730208,-1.05067 -0.6561998,-0.36619 -1.0908091,-0.19983 -1.0562035,-1.43879 0.023124,-0.82805 0.027374,-2.55759 0.00956,-3.84343 -0.087287,-6.27641 -0.055484,-8.85812 0.1156246,-9.3954 0.1029671,-0.32328 0.099511,-2.03556 -0.00736,-3.80505 -0.1071998,-1.76951 -0.1372948,-3.62271 -0.066842,-4.11824 0.070437,-0.49552 0.1137616,-2.52098 0.096283,-4.50099 -0.017487,-1.98003 0.061858,-4.6147 0.1762967,-5.85482 l 0.2081323,-2.25478 -1.9936284,-1.1158 c -2.9416433,-1.70261 -4.05116474,-0.71532 -3.89476527,2.25021 -0.09526994,7.10718 0.41118203,14.25885 0.16751261,21.35972 -0.0741137,1.08999 -0.0600598,3.43442 0.0312958,5.20987 0.16151477,3.14091 0.1555089,4.52876 -0.0345651,8.00555 -0.0901299,1.64868 -0.0615297,1.69275 1.44964566,2.23241 1.3121708,0.4686 4.1186927,0.84053 10.2181364,1.35422 0.678343,0.0571 2.1371,0.21949 3.241669,0.36078 2.462149,0.31491 6.85741,0.65612 7.214831,0.71517 1.714227,0.28322 5.466304,0.55084 5.512456,0.31606 z"
+ id="path5319"
+ sodipodi:nodetypes="cssssssssscccssssssssc"
+ inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo.png"
+ inkscape:export-xdpi="299.92236"
+ inkscape:export-ydpi="299.92236" />
+ <path
+ style="fill:#e0e1f3;fill-opacity:1;stroke:#e0e1f3;stroke-width:0.10939746;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 32.945386,599.95442 c -0.289511,-0.75182 -3.44276,-2.71884 -12.440382,-7.55827 -3.476499,-1.86983 -4.149466,-2.00085 -4.09083,-3.95446 0.479119,-15.96168 0.45615,-33.69123 -0.04454,-34.39911 -0.921099,-1.30223 -5.331942,-3.0561 -5.770375,-2.29446 -0.194323,0.33755 -0.377745,3.72848 -0.407652,7.53542 -0.0299,3.80693 -0.06717,8.72422 -0.08272,10.92732 -0.0156,2.20309 -0.04519,5.91545 -0.06578,8.24965 -0.081145,9.20582 0.02982,14.11024 0.326789,14.44818 0.171041,0.19467 1.386514,0.51107 2.701054,0.70311 2.292757,0.335 4.653532,1.2582 13.116087,4.09319 1.841306,0.61686 7.038681,2.97739 6.758332,2.24943 z"
+ id="path5394"
+ sodipodi:nodetypes="cssssssssssc"
+ inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo.png"
+ inkscape:export-xdpi="299.92236"
+ inkscape:export-ydpi="299.92236" />
+ <path
+ style="fill:#9cbd86;fill-opacity:1;stroke:#9cbd86;stroke-width:0.1093975;stroke-opacity:1"
+ d="m 35.928547,579.83469 -0.06603,-20.19233 -1.926829,-2.44647 c -3.660034,-4.64703 -10.439327,-9.81955 -11.568655,-8.82673 -0.271517,0.23866 -0.490296,1.88177 -0.486194,3.65133 0.03767,16.2356 0.113025,32.28618 0.160795,34.246 l 0.05834,2.39368 2.166141,1.24088 c 2.905723,1.66451 5.918971,4.24529 8.832251,7.5647 1.324355,1.50895 2.517771,2.70255 2.652019,2.65242 0.134288,-0.0502 0.214433,-9.17769 0.178127,-20.28348 z"
+ id="path5439"
+ inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo.png"
+ inkscape:export-xdpi="299.92236"
+ inkscape:export-ydpi="299.92236" />
+ </g>
+</svg>
Modified: trunk/public/images/remove_tag.svg
===================================================================
--- trunk/public/images/remove_tag.svg 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/public/images/remove_tag.svg 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
height="40"
id="svg3408"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
version="1.0"
sodipodi:docname="remove_tag.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -46,9 +47,10 @@
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1279"
- inkscape:window-height="949"
- inkscape:window-x="1280"
- inkscape:window-y="25" />
+ inkscape:window-height="717"
+ inkscape:window-x="81"
+ inkscape:window-y="25"
+ inkscape:window-maximized="0" />
<metadata
id="metadata3413">
<rdf:RDF>
@@ -72,7 +74,7 @@
height="40"
width="400"
id="rect6887"
- style="fill:#9cbd86;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.0299999;stroke-opacity:1;display:inline" />
+ style="fill:#5f2f8a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.02999989999999997;stroke-opacity:1;display:inline" />
<path
id="path3511"
d="M 372.97615,8.4376172 L 381.50309,16.964556 L 390.04309,8.4245439 L 392.64544,11.026893 L 384.10544,19.566906 L 392.63194,28.093415 L 390.05617,30.669191 L 381.52966,22.142682 L 372.98965,30.682694 L 370.3873,28.080343 L 378.9273,19.540331 L 370.40036,11.013393 L 372.97615,8.4376172"
Modified: trunk/public/images/svgs/logo.svg
===================================================================
--- trunk/public/images/svgs/logo.svg 2010-06-02 22:52:16 UTC (rev 1721)
+++ trunk/public/images/svgs/logo.svg 2010-06-08 10:26:16 UTC (rev 1722)
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
+ xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
@@ -12,16 +13,23 @@
height="600"
id="svg5147"
sodipodi:version="0.32"
- inkscape:version="0.45.1"
- sodipodi:docbase="/home/wybo/logilogi/docs/logo"
- sodipodi:docname="book_logo.svg"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="logo.svg"
inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo_affiliate.png"
inkscape:export-xdpi="36"
inkscape:export-ydpi="36"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0">
<defs
- id="defs5149" />
+ id="defs5149">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 300 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="750 : 300 : 1"
+ inkscape:persp3d-origin="375 : 200 : 1"
+ id="perspective4513" />
+ </defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
@@ -34,15 +42,17 @@
inkscape:pageshadow="2"
inkscape:zoom="0.7071068"
inkscape:cx="239.47194"
- inkscape:cy="430.11976"
+ inkscape:cy="316.98268"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:window-width="1270"
- inkscape:window-height="949"
+ inkscape:window-height="717"
inkscape:window-x="0"
- inkscape:window-y="21"
+ inkscape:window-y="25"
width="750px"
- height="600px" />
+ height="600px"
+ showgrid="false"
+ inkscape:window-maximized="0" />
<metadata
id="metadata5152">
<rdf:RDF>
@@ -59,7 +69,7 @@
inkscape:groupmode="layer"
id="layer1">
<path
- style="fill:#ccffff;fill-opacity:1;stroke:#9ddddc;stroke-width:1.00000095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#989cd7;fill-opacity:1;stroke:#989cd7;stroke-width:1.00000095000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 444.30633,526.93938 C 445.53795,520.59397 380.0189,505.00688 345.99113,497.37819 C 310.96151,489.52515 310.5493,489.49062 292.47239,486.22682 C 272.01224,482.53256 260.37267,480.43895 250.02314,476.56235 C 244.06232,473.19395 240.11434,474.72414 240.42868,463.3278 C 240.63882,455.71109 240.67778,439.80189 240.51526,427.97415 C 239.72235,370.24104 240.01099,346.49331 241.56559,341.55128 C 242.50093,338.57749 242.46953,322.82725 241.49549,306.55064 C 240.52168,290.27399 240.24833,273.22742 240.88804,268.6693 C 241.52785,264.1112 241.92138,245.4802 241.76263,227.26711 C 241.60369,209.05405 242.32446,184.81932 243.36413,173.41208 L 245.25473,152.67168 L 227.14481,142.40793 C 200.42321,126.74672 190.34446,135.82815 191.76514,163.10639 C 190.89978,228.48133 195.50031,294.26559 193.28684,359.58242 C 192.61362,369.60861 192.7416,391.1738 193.57084,407.50506 C 195.038,436.39663 194.98346,449.16268 193.25701,481.14366 C 192.43826,496.30898 192.69823,496.71436 206.42543,501.67834 C 218.34505,505.98871 243.83925,509.40996 299.24592,514.13507 C 305.408,514.66071 318.65914,516.15394 328.69298,517.45358 C 351.05884,520.35044 390.98494,523.48885 394.23178,524.03206 C 409.80364,526.63736 443.88713,529.09895 444.30633,526.93938 z "
id="path5319"
sodipodi:nodetypes="cssssssssscccssssssssc"
@@ -67,7 +77,7 @@
inkscape:export-xdpi="299.92236"
inkscape:export-ydpi="299.92236" />
<path
- style="fill:#ccffcc;fill-opacity:1;stroke:#9ddddc;stroke-width:1.00000095;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ style="fill:#e0e1f3;fill-opacity:1;stroke:#e0e1f3;stroke-width:1.00000095000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 490.33683,527.55623 C 487.70691,520.64047 459.06312,502.54716 377.32961,458.03187 C 345.74946,440.83222 339.63632,439.62715 340.16897,421.6569 C 344.52124,274.83456 344.31258,111.75042 339.76424,105.23893 C 331.39713,93.260531 291.32943,77.127631 287.34677,84.133481 C 285.58152,87.238471 283.91535,118.42976 283.64367,153.44754 C 283.37202,188.46536 283.03374,233.69677 282.89229,253.96175 C 282.75078,274.22686 282.48205,308.37466 282.295,329.84569 C 281.55811,414.52486 282.56561,459.6379 285.26345,462.74648 C 286.81723,464.53703 297.85846,467.44738 309.79959,469.21404 C 330.62677,472.29538 352.07181,480.78728 428.94483,506.8649 C 445.67106,512.53903 492.88346,534.25231 490.33683,527.55623 z "
id="path5394"
sodipodi:nodetypes="cssssssssssc"
@@ -75,7 +85,7 @@
inkscape:export-xdpi="299.92236"
inkscape:export-ydpi="299.92236" />
<path
- style="fill:#ccccff;fill-opacity:1;stroke:#9ddddc;stroke-width:1.00000131;stroke-opacity:1"
+ style="fill:#9cbd86;fill-opacity:1;stroke:#9cbd86;stroke-width:1.00000131000000003;stroke-opacity:1"
d="M 517.43553,342.48608 L 516.83609,156.74812 L 499.33297,134.24453 C 466.08558,91.498981 404.50322,43.91994 394.2445,53.052241 C 391.77806,55.247681 389.79067,70.361681 389.82794,86.638901 C 390.17005,235.98095 390.85468,383.62118 391.28858,401.64856 L 391.8185,423.66679 L 411.49549,435.08075 C 437.89081,450.39162 465.26286,474.13087 491.72682,504.66426 C 503.75709,518.54414 514.59798,529.52346 515.81745,529.06238 C 517.03729,528.6012 517.76531,444.64198 517.43553,342.48608 z "
id="path5439"
inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo.png"
Added: trunk/public/javascripts/blank.html
===================================================================
--- trunk/public/javascripts/blank.html (rev 0)
+++ trunk/public/javascripts/blank.html 2010-06-08 10:26:16 UTC (rev 1722)
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+Copyright (c) 2007 Brian Dillard and Brad Neuberg:
+Brian Dillard | Project Lead | bdi...@pa... | http://blogs.pathf.com/agileajax/
+Brad Neuberg | Original Project Creator | http://codinginparadise.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHE...
[truncated message content] |