[Logilogi-svn] SF.net SVN: logilogi:[1716] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1716] trunk
|
From: <wy...@us...> - 2010-04-08 12:56:29
|
Revision: 1716
http://logilogi.svn.sourceforge.net/logilogi/?rev=1716&view=rev
Author: wybow
Date: 2010-04-08 12:56:22 +0000 (Thu, 08 Apr 2010)
Log Message:
-----------
Some minor fixes, more to do
Modified Paths:
--------------
trunk/app/controllers/application_controller.rb
trunk/app/controllers/logi_inserts_controller.rb
trunk/app/helpers/application_helper.rb
trunk/app/models/global_config.rb
trunk/app/views/layouts/_header.html.erb
trunk/app/views/layouts/blank.html.erb
trunk/app/views/logi_tags/_edit.html.erb
trunk/app/views/logis/_edit.html.erb
trunk/app/views/logis/_edit_with_tags.html.erb
trunk/app/views/logis/_snippet.html.erb
trunk/app/views/logis/_tag_list.html.erb
trunk/app/views/logis/edit.html.erb
trunk/app/views/tags/_edit.html.erb
trunk/config/locales/en.yml
trunk/config/routes.rb
trunk/public/images/user_default_avatar.png
trunk/public/javascripts/application.js
trunk/public/javascripts/taglist.js
trunk/public/stylesheets/logilogi.css
Added Paths:
-----------
trunk/app/controllers/logi_extras_controller.rb
trunk/app/views/logi_extras/
trunk/app/views/logi_extras/_edit.html.erb
Removed Paths:
-------------
trunk/app/controllers/logi_tags_controller.rb
trunk/app/views/logi_tags/_toggle.html.erb
trunk/app/views/logi_tags/edit.js.rjs
Modified: trunk/app/controllers/application_controller.rb
===================================================================
--- trunk/app/controllers/application_controller.rb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/controllers/application_controller.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -397,6 +397,15 @@
### Shared insert / remove logic
def create_logi(logi_hash, options = {})
+ if logi_hash[:title].nil? or logi_hash[:title].empty?
+ logi_hash[:body] =~ /^<p>(.+?(\.|\?|<\/p>)+)/
+ match = $~
+ if match.nil? or match[1].size > 150
+ logi_hash[:title] = LogiVersion.strip_html(logi_hash[:body][0..50]) + '...'
+ else
+ logi_hash[:title] = LogiVersion.strip_html(match[1].gsub('.',''))
+ end
+ end
logi = Logi.new_with(:title => logi_hash[:title],
:body => logi_hash[:body],
:creator => current_user,
@@ -406,6 +415,9 @@
if options[:untagged]
logi.untag
else
+ if logi_hash[:link_string].nil? or logi_hash[:link_string].empty?
+ logi_hash[:link_string] = current_context.link.to_s
+ end
self.tag_with_link(logi, logi_hash[:link_string])
end
Added: trunk/app/controllers/logi_extras_controller.rb
===================================================================
--- trunk/app/controllers/logi_extras_controller.rb (rev 0)
+++ trunk/app/controllers/logi_extras_controller.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -0,0 +1,43 @@
+#--#
+# Copyright: (c) 2006-2009 The LogiLogi Foundation <fou...@lo...>
+#
+# License:
+# This file is part of the LogiLogi program. LogiLogi is Free Software.
+# You can run/distribute/modify LogiLogi under the terms of the GNU Affero
+# General Public License version 3. The Affero GPL states that running a
+# modified version or a derivative work also requires you to make the source
+# code of that work available to everyone that can interact with it. We
+# chose the Affero GPL to ensure that LogiLogi remains open and libre
+# (doc/LICENSE contains the full text of the legally binding license).
+#++#
+
+class LogiExtrasController < ApplicationController
+ ### Layouts
+
+ layout nil
+
+ ### Filters
+
+ before_filter :resolve_context, :find_logi_and_logi_version
+
+ ### REST-methods
+
+ def new
+ @logi = Logi.new_with(:creator => current_user,
+ :user_group => current_prefs.user_group)
+ @logi_version = @logi.current_logi_version
+ respond_to do |format|
+ format.js do
+ render :partial => 'edit'
+ end
+ end
+ end
+
+ def edit
+ respond_to do |format|
+ format.js do
+ render :partial => 'edit'
+ end
+ end
+ end
+end
Modified: trunk/app/controllers/logi_inserts_controller.rb
===================================================================
--- trunk/app/controllers/logi_inserts_controller.rb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/controllers/logi_inserts_controller.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -22,8 +22,6 @@
### Bodies
- top_body :navigation_bar_insert
-
### REST-methods
def new
Deleted: trunk/app/controllers/logi_tags_controller.rb
===================================================================
--- trunk/app/controllers/logi_tags_controller.rb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/controllers/logi_tags_controller.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,31 +0,0 @@
-#--#
-# Copyright: (c) 2006-2009 The LogiLogi Foundation <fou...@lo...>
-#
-# License:
-# This file is part of the LogiLogi program. LogiLogi is Free Software.
-# You can run/distribute/modify LogiLogi under the terms of the GNU Affero
-# General Public License version 3. The Affero GPL states that running a
-# modified version or a derivative work also requires you to make the source
-# code of that work available to everyone that can interact with it. We
-# chose the Affero GPL to ensure that LogiLogi remains open and libre
-# (doc/LICENSE contains the full text of the legally binding license).
-#++#
-
-class LogiTagsController < ApplicationController
- ### Layouts
-
- layout nil
-
- ### Filters
-
- before_filter :resolve_context, :find_logi_and_logi_version
-
- ### REST-methods
-
- def edit
- respond_to do |format|
- format.js do
- end
- end
- end
-end
Modified: trunk/app/helpers/application_helper.rb
===================================================================
--- trunk/app/helpers/application_helper.rb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/helpers/application_helper.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -14,13 +14,12 @@
# Methods added to this helper will be available to all templates in the application.
module ApplicationHelper
+ if InitialGlobalConfig::OFFLINE
+ def gravatar_for(bogus, options = {})
+ "<img class=\"#{options[:class]}\" alt=\"#{options[:alt]}\" width=\"#{options[:size]}\" height=\"#{options[:size]}\" src=\"/images/user_default_avatar.png\" />"
+ end
+ end
- # OFFLINE For offline demoing
- #
-# def gravatar_for(bogus, options = {})
-# "<img class=\"#{options[:class]}\" alt=\"#{options[:alt]}\" width=\"#{options[:size]}\" height=\"#{options[:size]}\" src=\"/images/user_default_avatar.png\" />"
-# end
-
### Javascript compression
def compressed_javascript_include_tag(*sources)
@@ -132,8 +131,8 @@
:description => '<h2>' + t('h.application.browsing') + '</h2>'},
{:text => t('h.application.view'), :name => "navigation_view",
:description => '<h2>' + t('h.application.viewing') + '</h2>'},
- {:text => t('h.application.insert'), :name => "navigation_insert",
- :description => '<h2>' + t('h.application.inserting') + '</h2>'},
+# {:text => t('h.application.insert'), :name => "navigation_insert",
+# :description => '<h2>' + t('h.application.inserting') + '</h2>'},
{:text => t('h.application.edit'), :name => "navigation_edit",
:description => '<h2>' + t('h.application.editing') + '</h2>'},
{:text => t('h.application.create'), :name => "navigation_new",
@@ -144,9 +143,10 @@
tabs[1][:url] = browse_ll_url(current_context.link)
tabs[2][:url] = ll_url(current_context.link)
logi = current_context.link.volatile_to_logi
- tabs[3][:url] = new_logi_logi_inserts_url(logi)
+# tabs[3][:url] = new_logi_logi_inserts_url(logi)
if logi.edit_rights?(current_user)
- tabs[4][:url] = edit_logi_url(current_context.link.volatile_to_logi)
+ tabs[3][:url] = edit_logi_url(current_context.link.volatile_to_logi)
+# tabs[4][:url] = edit_logi_url(current_context.link.volatile_to_logi)
end
end
return tabs
Modified: trunk/app/models/global_config.rb
===================================================================
--- trunk/app/models/global_config.rb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/models/global_config.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -155,6 +155,14 @@
end
end
+ # Disables log_log if OFFLINE
+ #
+ if InitialGlobalConfig::OFFLINE
+ def self.use_log_log
+ return false
+ end
+ end
+
### Usage-methods
# Passes requests on to the object below
Modified: trunk/app/views/layouts/_header.html.erb
===================================================================
--- trunk/app/views/layouts/_header.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/layouts/_header.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -27,9 +27,6 @@
<div id="site_link">
<%= site_link(:length => 17) %>
</div>
- <div id="version" title="<%= t 'v.layouts.second_version' %>">
- Manta
- </div>
<div id="title_line">
<%= t 'v.layouts.title_line' %>
</div>
@@ -52,6 +49,7 @@
<%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %> |
<% end %>
</div>
+ <% if !local_assigns[:tabs_disabled] %>
<div id="primarytabs">
<ul>
<li id="primarytabs_main"><%= link_to t('v.layouts.main'), root_url %></li>
@@ -61,5 +59,6 @@
<li id="primarytabs_users"><%= link_to t('v.layouts.users'), users_url %></li>
</ul>
</div>
+ <% end %>
<div class="spacer"></div>
</div>
Modified: trunk/app/views/layouts/blank.html.erb
===================================================================
--- trunk/app/views/layouts/blank.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/layouts/blank.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,7 +1,7 @@
<% @page_class += ' blank' %>
<%= render :partial => 'layouts/head' %>
- <%= render :partial => GlobalConfig.header_partial %>
+ <%= render :partial => GlobalConfig.header_partial, :locals => {:tabs_disabled => true} %>
<%= yield :top_body %>
Added: trunk/app/views/logi_extras/_edit.html.erb
===================================================================
--- trunk/app/views/logi_extras/_edit.html.erb (rev 0)
+++ trunk/app/views/logi_extras/_edit.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -0,0 +1,12 @@
+<% render :layout => 'application/panel', :locals => {:id => "title"} do %>
+ <label class="for_title"><%= t 'v.logis.title_label' %></label>
+ <%= text_field_tag 'logi[title]', (@logi_version.nil? ? nil : @logi_version.title),
+ :class => "logi_title", :id => "logi_edit_title",
+ :tabindex => 97 %>
+<% end %>
+
+<div class="spacer"></div>
+
+<%= render :partial => 'logi_tags/edit' %>
+
+<div class="spacer"></div>
Modified: trunk/app/views/logi_tags/_edit.html.erb
===================================================================
--- trunk/app/views/logi_tags/_edit.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logi_tags/_edit.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,19 +1,5 @@
<div class="main_column">
<%= render :partial => 'tags/edit', :locals => {:name => 'logi_tags_edit',
- :link => (@logi.new_record? ? current_context.link :
- (@logi.untagged? ? nil : @logi.link))} %>
+ :link => (@logi.new_record? ? current_context.link :
+ (@logi.untagged? ? nil : @logi.link))} %>
</div>
-
-<div class="side_column">
- <% render :layout => 'application/wizzard_cloud_panel', :locals => {
- :id => 'tags_cloud'} do %>
- <h3><%= t 'v.logi_tags.tags' %></h3>
- <p><%= t 'v.logi_tags.like_tree' %></p>
- <% end %>
-
- <% render :layout => 'application/wizzard_cloud_panel', :locals => {
- :id => 'check_cloud'} do %>
- <h3><%= t 'v.logi_tags.check' %></h3>
- <p><%= t 'v.logi_tags.check_there' %></p>
- <% end %>
-</div>
Deleted: trunk/app/views/logi_tags/_toggle.html.erb
===================================================================
--- trunk/app/views/logi_tags/_toggle.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logi_tags/_toggle.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,13 +0,0 @@
-<% if @logi.untagged? %>
- <div class="notice_cloud"><%= t 'v.logi_tags.want_browsed' %></div>
- <p><%= t 'v.logi_tags.can_edit' %></p>
- <div class="spacer"></div>
- <%= toggle_button_to_remote t('v.logi_tags.edit_tags'), {
- :url => edit_logi_logi_tags_url(@logi), :method => :get},
- :class => 'unfold_button',
- :disabled => local_assigns[:unfold_disabled] %>
-<% end %>
-
-<% javascript_tag do -%>
- mcorners.run();
-<% end -%>
Deleted: trunk/app/views/logi_tags/edit.js.rjs
===================================================================
--- trunk/app/views/logi_tags/edit.js.rjs 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logi_tags/edit.js.rjs 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,2 +0,0 @@
-page.replace_html 'edit_tags_area', :partial => 'edit'
-page.replace_html 'logi_tags_toggle', :partial => "toggle", :locals => {:unfold_disabled => true}
Modified: trunk/app/views/logis/_edit.html.erb
===================================================================
--- trunk/app/views/logis/_edit.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logis/_edit.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -9,19 +9,21 @@
<div id="logi_length_warning" class="length_warning"></div>
-<% render :layout => 'application/panel', :locals => {:id => "title"} do %>
- <label class="for_title"><%= t 'v.logis.title_label' %></label>
- <%= hidden_field_tag 'logi[title_suggested]',
- (logi_version.nil? or logi_version.new_record?) %>
- <%= text_field_tag 'logi[title]', (logi_version.nil? ? nil : logi_version.title),
- :class => "logi_title", :id => "logi_edit_title",
- : "logiLogisOnChange(tinyMCE.getInstanceById('logi_edit_body')," +
- " $('logi_edit_title'), #{GlobalConfig.maximum_logi_version_size})",
- :tabindex => 97 %>
+<div id="advanced_area">
+<% render :layout => 'application/panel', :locals => {:id => "advanced"} do %>
+ <label><%= t 'v.logis.extras_label' %></label>
+ <%= toggle_button_to_remote t('v.logis.edit'), {
+ :update => "advanced_area", :url => (logi.new_record? ?
+ new_logi_logi_extras_url(@logi) :
+ edit_logi_logi_extras_url(@logi)),
+ :method => :get},
+ :class => 'unfold_button', :disabled => local_assigns[:unfold_disabled],
+ :tabindex => 98 %>
<% end %>
+</div>
<% javascript_tag do -%>
- logi_editor = new LogiEditor('logi_edit_body','EditorDiv','logi_edit_title',
+ logi_editor = new LogiEditor('logi_edit_body','EditorDiv',
<%= GlobalConfig.maximum_logi_version_size %>,
"<%= t('v.logis.check_length_max', :size => '{{size}}', :max => GlobalConfig.maximum_logi_version_size) %>",
"<%= t('v.logis.check_length_reached', :size => '{{size}}', :max => GlobalConfig.maximum_logi_version_size) %>",
Modified: trunk/app/views/logis/_edit_with_tags.html.erb
===================================================================
--- trunk/app/views/logis/_edit_with_tags.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logis/_edit_with_tags.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -10,14 +10,6 @@
<div class="spacer"></div>
-<div id="edit_tags_area">
- <% if !@logi.untagged? or @selected == "edit_tags" %>
- <%= render :partial => 'logi_tags/edit' %>
- <% end %>
-</div>
-
-<div class="spacer"></div>
-
<div class="main_column">
<% render :layout => 'application/panel', :locals => {:id => "submit"} do %>
<label><%= t 'defaults.submit_label' %></label>
Modified: trunk/app/views/logis/_snippet.html.erb
===================================================================
--- trunk/app/views/logis/_snippet.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logis/_snippet.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,4 +1,4 @@
-<div class="box <%= (logi.untagged? ? "secondary_" : "") %>border_panel logi snippet">
+<div class="box border_panel logi snippet">
<div class="panel_content_padding">
<% if logi.nil? %>
<i><%= t 'defaults.none' %></i>
Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logis/_tag_list.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -29,7 +29,7 @@
<%= end_form_tag() %>
<% end %>
<% javascript_tag do %>
- window.<%= name %> = new TagList('<%= name %>', '<%= url %>',
+ window.<%= name %> = new TagList('<%= name %>', null,
'<%= param_name %>',
'<%= (local_assigns[:replace_string] ? local_assigns[:replace_string] :
Tag.replace.to_s(:for => :show)) %>',
Modified: trunk/app/views/logis/edit.html.erb
===================================================================
--- trunk/app/views/logis/edit.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/logis/edit.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -1,15 +1,4 @@
<% thorny_form_for(@logi, :url => logi_url(@logi),
:html => {:id => "logi_form"}) do |form| %>
- <% render :layout => 'edit_bar', :locals => {:selected => "edit_text"} do %>
- <% if @logi.untagged? %>
- <div id="logi_tags_toggle">
- <%= render :partial => 'logi_tags/toggle', :locals => {
- :unfold_disabled => (@selected == "edit_tags") } %>
- </div>
- <% else %>
- <p><%= t 'v.logis.can_edit' %></p>
- <% end %>
- <% end %>
-
<%= render :partial => 'edit_with_tags', :locals => {:form => form} %>
<% end -%>
Modified: trunk/app/views/tags/_edit.html.erb
===================================================================
--- trunk/app/views/tags/_edit.html.erb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/app/views/tags/_edit.html.erb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -10,4 +10,6 @@
:param_name => 'check_ll_link_string', :without_form => true} %>
<div class="spacer"></div>
<% end %><!-- end tags -->
+<!--
<%= render :partial => 'logis/check', :locals => {:name => name} %>
+-->
Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/config/locales/en.yml 2010-04-08 12:56:22 UTC (rev 1716)
@@ -389,7 +389,7 @@
other: "{{count}} stars out of 5:"
to_version: "(to version)"
versioned_perma_link_label: "The following is the versioned permalink of this logi. Hit Ctrl A followed by Ctrl C on your keyboard to copy to your clipboard:"
- view: View
+ view: Logi
viewing: "Currently viewing a logi."
you: You
m:
@@ -615,7 +615,7 @@
preferences: Preferences
second_version: "The second version of LogiLogi, now in public beta."
signup: "Signup for account"
- title_line: "Philosophy beyond the Book"
+ title_line: "Philosophy on-line, discuss your ideas"
topics_and_logis: "Tags & logis"
user_page: "User page"
users: Users
@@ -677,7 +677,7 @@
tags: Tags
want_browsed: "Want your logi to be browsed to?"
logis:
- load_editor: "load comment editor"
+ load_editor: "Expand comment editor"
add_tag: "Add tag"
add_remark: "add remark"
are_positive:
@@ -728,7 +728,8 @@
other: "Found {{count}} matches for larger, or differently ordered tag-sets."
create_and_link: "create a new logi and attach it to a phrase"
create_new_competing_logi: "Create a new logi for these tags"
- enable_edit_tags: "Enable and edit its tags."
+ edit: "Expand editor"
+ enable_edit_tags: "Enable and edit its tags"
find_next_time: "Want to find it next time?"
found_for_tag_sets: "Found logis for tag sets"
found_logi: "Found the logi."
@@ -757,15 +758,16 @@
related_tags_suggested: "Related tags suggested for browsing"
remark_to_author: "Short remark to author?"
remarks: Remarks
- select_edit: "Select whether you want to edit the text, insert or remove stuff, or edit the settings."
+ select_edit: "Select whether you want to edit the text, or the settings."
select_insert_remove: "Select whether you want to attach things to phrases in the text, or detach them from the text."
tags_label: "tags:"
+ extras_label: "Extras: Title and Tags"
title_label: "Title:"
usergroup_label: "Usergroup:"
votes:
one: "{{count}} vote"
other: "{{count}} votes"
- want_contend: "Want it to contend for tags ?"
+ want_contend: "Want to browse to it using tags ?"
what_to_edit: "What to edit?"
main_page:
browse_tags: "Browse tags"
Modified: trunk/config/routes.rb
===================================================================
--- trunk/config/routes.rb 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/config/routes.rb 2010-04-08 12:56:22 UTC (rev 1716)
@@ -39,7 +39,7 @@
:path_prefix => ':ll_link_string/do',
:name_prefix => '_hidden_',
:requirements => { :ll_link_string => /.*/ }
- map.resource :links, :ratings, :logi_settings, :logi_inserts, :logi_tags,
+ map.resource :links, :ratings, :logi_settings, :logi_inserts, :logi_extras,
:logi_versions, :remarks, :annotations, :external_links, :perma_links,
:linked_logis, :comments,
:path_prefix => ':ll_link_string/do',
Modified: trunk/public/images/user_default_avatar.png
===================================================================
(Binary files differ)
Modified: trunk/public/javascripts/application.js
===================================================================
--- trunk/public/javascripts/application.js 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/public/javascripts/application.js 2010-04-08 12:56:22 UTC (rev 1716)
@@ -159,11 +159,10 @@
var LogiEditor = Class.create({
// Constructors
- initialize: function(textarea_id, hidden_div_id, title_id,
+ initialize: function(textarea_id, hidden_div_id,
maximum_logi_size, max_msg, reached_msg, exeeded_msg, defer) {
this.textarea_id = textarea_id;
this.hidden_div_id = hidden_div_id;
- this.title_id = title_id;
this.maximum_logi_size = maximum_logi_size;
this.max_msg = max_msg;
this.reached_msg = reached_msg;
@@ -201,7 +200,7 @@
// theme_advanced_buttons1_add_before : "h2",
width: "446",
height: "515", // also set in css
- init_instance_callback: logiLogisInitEditor(this.title_id,
+ init_instance_callback: logiLogisInitEditor(
this.hidden_div_id, this.textarea_id, this.maximum_logi_size,
this.max_msg, this.reached_msg, this.exeeded_msg),
editor_selector : "editable",
@@ -210,9 +209,9 @@
}
});
-function logiLogisCheckLength(inst, title, max_size,
+function logiLogisCheckLength(inst, max_size,
max_msg, reached_msg, exeeded_msg) {
- var length = inst.getContent().length + title.value.length;
+ var length = inst.getContent().length;
var length_w_div = $('logi_length_warning');
logiDisplayWarning(length_w_div, length, max_size,
max_msg, reached_msg, exeeded_msg);
@@ -272,31 +271,30 @@
}
}
-function logiLogisOnChange(inst, title, max_size,
+function logiLogisOnChange(inst, max_size,
max_msg, reached_msg, exeeded_msg) {
- setTimeout(function() {logiLogisCheckLength(inst, title, max_size,
+ setTimeout(function() {logiLogisCheckLength(inst, max_size,
max_msg, reached_msg, exeeded_msg);} , 500);
// if ($('logi_title_suggested').value == 'true') {
// setTimeout(function() {logiLogisSuggestTitle(inst, title);} , 500);
// }
}
-function logiLogisEditorOnChange(title, max_size,
+function logiLogisEditorOnChange(max_size,
max_msg, reached_msg, exeeded_msg) {
return function(inst) {
if (typeof(timer) != 'undefined') {
clearTimeout(timer);
}
- timer = logiLogisOnChange(inst, title, max_size,
+ timer = logiLogisOnChange(inst, max_size,
max_msg, reached_msg, exeeded_msg);
};
}
-function logiLogisInitEditor(title_id, editor_id, textarea_id, max_size,
+function logiLogisInitEditor(editor_id, textarea_id, max_size,
max_msg, reached_msg, exeeded_msg) {
return function (inst) {
- var title = $(title_id);
- var f = logiLogisEditorOnChange(title, max_size,
+ var f = logiLogisEditorOnChange(max_size,
max_msg, reached_msg, exeeded_msg);
f(inst);
inst.onEvent.add(f);
Modified: trunk/public/javascripts/taglist.js
===================================================================
--- trunk/public/javascripts/taglist.js 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/public/javascripts/taglist.js 2010-04-08 12:56:22 UTC (rev 1716)
@@ -144,11 +144,13 @@
// Submitting
submit: function() {
- new Ajax.Request(this.url, {
- asynchronous: true, evalScripts: true, method: 'get',
- parameters: this.param_name + '=' +
- this.hidden_tags_string()});
- return false;
+ if (this.url != null) {
+ new Ajax.Request(this.url, {
+ asynchronous: true, evalScripts: true, method: 'get',
+ parameters: this.param_name + '=' +
+ this.hidden_tags_string()});
+ return false;
+ }
},
// Rendering
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2010-03-24 10:56:21 UTC (rev 1715)
+++ trunk/public/stylesheets/logilogi.css 2010-04-08 12:56:22 UTC (rev 1716)
@@ -534,8 +534,8 @@
clear: left;
font-size: 1.3em;
margin-bottom: -1em;
- word-spacing: 0.2em;
- letter-spacing: 0.2em;
+ word-spacing: 0.1em;
+ letter-spacing: 0.05em;
font-variant: small-caps;
color: white;
}
@@ -1084,10 +1084,11 @@
#remove_options {
padding-top: 3em;
}
+#advanced_area .add_button,
.blank .add_button {
margin-left: 0.5em;
}
-.blank .tag {
+#advanced_area .tag {
font-size: 1.2em;
margin-right: 0.3em;
margin-top: 0.8em;
@@ -1111,11 +1112,11 @@
margin-right: 0.5em;
line-height: 1.65em;
}
-.blank input.tag_list {
+#advanced_area input.tag_list {
margin-top: 1em;
font-size: 1em;
}
-.blank .add_tag_form {
+#advanced_area .add_tag_form {
float: right;
clear: both;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|