[Logilogi-svn] SF.net SVN: logilogi:[1748] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1748] trunk
|
From: <wy...@us...> - 2010-06-29 15:34:30
|
Revision: 1748
http://logilogi.svn.sourceforge.net/logilogi/?rev=1748&view=rev
Author: wybow
Date: 2010-06-29 15:34:23 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Fixed user color bug and edit-bug
Modified Paths:
--------------
trunk/app/controllers/user_sessions_controller.rb
trunk/app/helpers/application_helper.rb
trunk/app/views/logis/edit.html.erb
trunk/config/locales/en.yml
trunk/db/schema.rb
trunk/public/stylesheets/logilogi.css
Modified: trunk/app/controllers/user_sessions_controller.rb
===================================================================
--- trunk/app/controllers/user_sessions_controller.rb 2010-06-28 11:09:57 UTC (rev 1747)
+++ trunk/app/controllers/user_sessions_controller.rb 2010-06-29 15:34:23 UTC (rev 1748)
@@ -43,17 +43,16 @@
if result
good_result = true
if session[:invitation].nil?
- flash[:notice] = t 'c.user_sessions.logged_in'
+ flash.now[:notice] = t 'c.user_sessions.logged_in'
shift_return_url
redirect_to return_url_or_default(user_url(@user_session.user))
else
- flash[:notice] = t 'c.user_sessions.logged_in_accept_invitation'
+ flash.now[:notice] = t 'c.user_sessions.logged_in_accept_invitation'
redirect_to edit_invitation_url(session[:invitation])
end
end
end
if !good_result
- flash.now[:error] = t 'c.user_sessions.error_logging_in'
if !@user_session.openid_identifier.nil?
@selected = "openid"
end
Modified: trunk/app/helpers/application_helper.rb
===================================================================
--- trunk/app/helpers/application_helper.rb 2010-06-28 11:09:57 UTC (rev 1747)
+++ trunk/app/helpers/application_helper.rb 2010-06-29 15:34:23 UTC (rev 1748)
@@ -432,23 +432,23 @@
def link_to_cloud_tag_element(text, link, css_class, *args)
return '<div class="floated_rounded_wrapper">' + link_to_rounded(text,
- link, 'tag cloud_tag link_tag ' + css_class, *args) + '</div>'
+ link, 'tag cloud_tag link_tag ' + css_class, 25, *args) + '</div>'
end
def link_to_navigation_tag(text, link, *args)
- return link_to_rounded(text, link, 'tag link_tag', *args)
+ return link_to_rounded(text, link, 'tag link_tag', 25, *args)
end
def link_to_navigation_author(text, link, *args)
- return link_to_rounded(text, link, 'author', *args)
+ return link_to_rounded(text, link, 'author', 35, *args)
end
# if changed also change in lib/application_view
- def link_to_rounded(text, link, css_class, options = {})
+ def link_to_rounded(text, link, css_class, length, options = {})
return '<div class="' + css_class +
'" >' +
'<div class="content_padding"><a href="' + link + '">' +
- truncate(text, :length => 25) + '</a></div></div>'
+ truncate(text, :length => length) + '</a></div></div>'
end
def link_to_js_rounded(text, javascript, css_class, options = {})
Modified: trunk/app/views/logis/edit.html.erb
===================================================================
--- trunk/app/views/logis/edit.html.erb 2010-06-28 11:09:57 UTC (rev 1747)
+++ trunk/app/views/logis/edit.html.erb 2010-06-29 15:34:23 UTC (rev 1748)
@@ -1,10 +1,10 @@
+<%= render :partial => 'dhtml_history_js.html.erb' %>
+<% javascript_tag do -%>
+ if (dhtmlHistory.isFirstLoad()) {
+ <%= add_simple_history_string('logi_tags_edit_list', '/' + current_context.link.to_s + '/do/edit', '') %>
+ }
+<% end %>
<% thorny_form_for(@logi, :url => logi_url(@logi),
:html => {:id => "logi_form"}) do |form| %>
- <%= render :partial => 'dhtml_history_js.html.erb' %>
- <% javascript_tag do -%>
- if (dhtmlHistory.isFirstLoad()) {
- <%= add_simple_history_string('logi_tags_edit_list', '/' + current_context.link.to_s + '/do/edit', '') %>
- }
- <% end %>
<%= render :partial => 'edit_with_tags', :locals => {:form => form} %>
<% end -%>
Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml 2010-06-28 11:09:57 UTC (rev 1747)
+++ trunk/config/locales/en.yml 2010-06-29 15:34:23 UTC (rev 1748)
@@ -173,7 +173,6 @@
page_name:
index: Searching
user_sessions:
- error_logging_in: "Problem logging you in."
logged_in: "Login successful."
logged_in_accept_invitation: "Logged you in. Now you can accept your invitation."
logged_out: "Logged you out."
Modified: trunk/db/schema.rb
===================================================================
--- trunk/db/schema.rb 2010-06-28 11:09:57 UTC (rev 1747)
+++ trunk/db/schema.rb 2010-06-29 15:34:23 UTC (rev 1748)
@@ -48,7 +48,7 @@
t.integer "domain_levels", :null => false
t.boolean "use_language_subdomains", :null => false
t.integer "my_openid_affiliate_id", :null => false
- t.string "available_subdomains_string", :default => "", :null => false
+ t.string "available_subdomains_string", :null => false
t.integer "minimum_diff_size", :null => false
t.integer "maximum_logi_size", :null => false
t.integer "maximum_logi_version_size", :null => false
@@ -68,7 +68,7 @@
t.string "user_tag_string", :null => false
t.string "user_group_tag_string", :null => false
t.string "peer_group_tag_string", :null => false
- t.string "replace_tag_string", :default => "", :null => false
+ t.string "replace_tag_string", :null => false
t.string "sandbox_tag_string", :null => false
t.string "untagged_tag_string", :null => false
t.boolean "use_log_log", :default => false, :null => false
@@ -108,34 +108,34 @@
t.integer "to_logi_version_nr"
t.string "requested_tags_string", :limit => 120
t.string "received_tags_string", :limit => 120
- t.string "position_ranges_string", :limit => 512, :default => "", :null => false
+ t.string "position_ranges_string", :limit => 512, :null => false
t.integer "stance", :null => false
t.datetime "created_at", :null => false
t.boolean "re_resolve", :default => false, :null => false
end
create_table "logi_versions", :force => true do |t|
- t.integer "logi_id", :null => false
- t.integer "editor_user_id", :null => false
- t.integer "nr", :null => false
- t.string "position_ranges_string", :limit => 8192, :default => ""
- t.datetime "created_at", :null => false
+ t.integer "logi_id", :null => false
+ t.integer "editor_user_id", :null => false
+ t.integer "nr", :null => false
+ t.string "position_ranges_string", :limit => 8192, :null => false
+ t.datetime "created_at", :null => false
end
add_index "logi_versions", ["logi_id", "nr"], :name => "index_logi_versions_on_logi_id_and_nr", :unique => true
create_table "logis", :force => true do |t|
- t.string "perma_id", :null => false
- t.integer "user_group_id", :null => false
- t.integer "creator_user_id", :null => false
- t.text "text_stack", :null => false
+ t.string "perma_id", :null => false
+ t.integer "user_group_id", :null => false
+ t.integer "creator_user_id", :null => false
+ t.text "text_stack", :null => false
t.string "current_title", :limit => 100
- t.string "current_snippet", :limit => 300, :null => false
- t.integer "restriction", :default => 0, :null => false
- t.string "tags_string", :limit => 120, :default => "", :null => false
- t.integer "visits", :default => 0, :null => false
- t.datetime "created_at", :null => false
- t.integer "kind", :null => false
+ t.string "current_snippet", :limit => 300, :null => false
+ t.integer "restriction", :default => 0, :null => false
+ t.string "tags_string", :limit => 120, :null => false
+ t.integer "visits", :default => 0, :null => false
+ t.datetime "created_at", :null => false
+ t.integer "kind", :null => false
end
add_index "logis", ["perma_id"], :name => "index_logis_on_perma_id", :unique => true
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2010-06-28 11:09:57 UTC (rev 1747)
+++ trunk/public/stylesheets/logilogi.css 2010-06-29 15:34:23 UTC (rev 1748)
@@ -747,6 +747,7 @@
margin-right: 0.3em;
margin-top: 0.8em;
}
+#navigation_bar .author a,
#users_show #header a.user_link {
color: #fff;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|