[Logilogi-svn] SF.net SVN: logilogi:[1728] trunk
Status: Beta
Brought to you by:
wybow
Menu
▾
▴
[Logilogi-svn] SF.net SVN: logilogi:[1728] trunk
|
From: <wy...@us...> - 2010-06-23 15:44:08
|
Revision: 1728
http://logilogi.svn.sourceforge.net/logilogi/?rev=1728&view=rev
Author: wybow
Date: 2010-06-23 15:43:59 +0000 (Wed, 23 Jun 2010)
Log Message:
-----------
Added user blog pages
Modified Paths:
--------------
trunk/app/controllers/application_controller.rb
trunk/app/controllers/comments_controller.rb
trunk/app/controllers/password_resets_controller.rb
trunk/app/controllers/user_sessions_controller.rb
trunk/app/controllers/users_controller.rb
trunk/app/helpers/application_helper.rb
trunk/app/models/const/global_config.rb
trunk/app/models/tag.rb
trunk/app/models/user.rb
trunk/app/views/annotations/edit.html.erb
trunk/app/views/changes/_list.html.erb
trunk/app/views/comments/_new.html.erb
trunk/app/views/external_links/edit.html.erb
trunk/app/views/invitations/edit.html.erb
trunk/app/views/layouts/_dbr_header.html.erb
trunk/app/views/layouts/_header.html.erb
trunk/app/views/layouts/_lirmm_header.html.erb
trunk/app/views/links/edit.html.erb
trunk/app/views/logi_versions/show.html.erb
trunk/app/views/logis/_commenting_logis.html.erb
trunk/app/views/logis/_tag_list.html.erb
trunk/app/views/logis/printer_friendly.html.erb
trunk/app/views/peer_groups/_activity.html.erb
trunk/app/views/remarks/edit.html.erb
trunk/app/views/tags/_edit.html.erb
trunk/app/views/users/_user.html.erb
trunk/app/views/users/show.html.erb
trunk/config/locales/en.yml
trunk/db/schema.rb
trunk/public/images/header_background.png
trunk/public/images/logo.png
trunk/public/images/logo.svg
trunk/public/images/svgs/header_background.svg
trunk/public/stylesheets/logilogi.css
trunk/test/fixtures/users.yml
Added Paths:
-----------
trunk/app/views/users/_unfoldable_editor.html.erb
trunk/db/migrate/20100623093032_add_blogs.rb
trunk/public/images/user_header_background.png
Modified: trunk/app/controllers/application_controller.rb
===================================================================
--- trunk/app/controllers/application_controller.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/controllers/application_controller.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -295,7 +295,7 @@
def user_group_ll_url(user_group, options = {})
if user_group.personal?
- self.user_ll_url(user_group.personal_user, options)
+ self.user_url(user_group.personal_user, options)
else
logi_url(user_group.home_page_link.to_s, options)
end
@@ -716,7 +716,7 @@
def require_no_login
if !self.current_user.anonymous?
flash[:warning] = t 'c.application.must_not_be_logged_in'
- redirect_to return_url_or_default(user_ll_url(current_user))
+ redirect_to return_url_or_default(user_url(current_user))
return false
end
end
Modified: trunk/app/controllers/comments_controller.rb
===================================================================
--- trunk/app/controllers/comments_controller.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/controllers/comments_controller.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -22,6 +22,7 @@
### REST-methods
def new
+ @from_blog = (params[:from_blog] ? true : false)
@selected = params[:selected] || 'new_logi'
@commenting_logi = Logi.new_with(:creator => current_user,
:user_group => current_prefs.user_group)
@@ -33,6 +34,7 @@
alias :show :new
def create
+ @from_blog = (params[:from_blog] ? true : false)
if params[:perma_link]
@link = Link.new_from_s(params[:perma_link])
@link.resolve
@@ -57,16 +59,44 @@
flash.now[:error] = t 'c.comments.error_connecting'
@selected = 'existing_logi'
end
- else # new logi
+ elsif @from_blog
@commenting_logi, @commenting_logi_version = self.create_logi(
- params[:logi], :untagged => true)
- @commenting = Commenting.new(:from_logi => @logi,
- :to_logi => @commenting_logi, :user => current_user)
- body_with_inserts = params[:body_with_inserts]
+ params[:logi].merge({
+ :link_string => (current_user.home_page_tag_string +
+ '/' + Tag.blog.to_s)}))
transfer_errors(@commenting_logi, @logi)
if @logi.errors.empty? and @commenting_logi_version.valid? and
+ self.thorny_form_free_of_spam?
+ @commenting_logi.save
+
+ flash[:notice] = t 'c.logis.created',
+ :logi => @commenting_logi.to_s(:for => :full_show)
+
+ render :update do |page|
+ page.redirect_to logi_ll_url(@logi)
+ end
+ else
+ transfer_errors(@commenting_logi_version, @logi_version)
+
+ flash.now[:error] = t 'c.comments.error_creating'
+ @selected = 'new_logi'
+ end
+ else # new logi
+ if params[:from_blog]
+ @commenting_logi, @commenting_logi_version = self.create_logi(
+ params[:logi], :untagged => true)
+ else
+ @commenting_logi, @commenting_logi_version = self.create_logi(
+ params[:logi], :untagged => true)
+ @commenting = Commenting.new(:from_logi => @logi,
+ :to_logi => @commenting_logi, :user => current_user)
+ end
+
+ transfer_errors(@commenting_logi, @logi)
+
+ if @logi.errors.empty? and @commenting_logi_version.valid? and
@commenting.valid? and self.thorny_form_free_of_spam?
# we can save as we know the link is valid on the logi
@commenting_logi.save
Modified: trunk/app/controllers/password_resets_controller.rb
===================================================================
--- trunk/app/controllers/password_resets_controller.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/controllers/password_resets_controller.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -49,7 +49,7 @@
@user.password_confirmation = params[:user][:password_confirmation]
if @user.save
flash[:notice] = t 'c.password_resets.updated'
- redirect_to user_ll_url(@user)
+ redirect_to user_url(@user)
else
render :action => :edit
end
Modified: trunk/app/controllers/user_sessions_controller.rb
===================================================================
--- trunk/app/controllers/user_sessions_controller.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/controllers/user_sessions_controller.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -45,7 +45,7 @@
if session[:invitation].nil?
flash[:notice] = t 'c.user_sessions.logged_in'
shift_return_url
- redirect_to return_url_or_default(user_ll_url(@user_session.user))
+ redirect_to return_url_or_default(user_url(@user_session.user))
else
flash[:notice] = t 'c.user_sessions.logged_in_accept_invitation'
redirect_to edit_invitation_url(session[:invitation])
Modified: trunk/app/controllers/users_controller.rb
===================================================================
--- trunk/app/controllers/users_controller.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/controllers/users_controller.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -93,7 +93,7 @@
@user.save do |result|
if result
flash[:notice] = t 'c.users.updated'
- redirect_to return_url_or_default(user_ll_url(@user))
+ redirect_to return_url_or_default(user_url(@user))
else
flash[:error] = t 'c.users.error_updating'
render :action => :edit
@@ -105,7 +105,7 @@
params[:prefs_profile][:default_peer_group_id])
if @prefs_profile.save
flash[:notice] = t 'c.users.settings_updated'
- redirect_to return_url_or_default(user_ll_url(@user))
+ redirect_to return_url_or_default(user_url(@user))
else
flash[:error] = t 'c.users.error_updating_settings'
render :action => 'edit'
@@ -124,7 +124,7 @@
end
else
flash[:error] = t 'c.users.error_deleting_admin'
- redirect_to user_ll_url(@user)
+ redirect_to user_url(@user)
end
end
@@ -168,7 +168,7 @@
def require_current
if self.current_user != @user
flash[:error] = t 'c.users.error_permissions'
- redirect_to user_ll_url(@user)
+ redirect_to user_url(@user)
return false
end
end
Modified: trunk/app/helpers/application_helper.rb
===================================================================
--- trunk/app/helpers/application_helper.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/helpers/application_helper.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -787,13 +787,13 @@
name = user.name
end
link_to truncate_options(name, options), @controller.user_url(user),
- html_options.merge(:class => ' user_ll_link')
+ html_options.merge(:class => ' user_link')
end
def user_group_ll_link(user_group, options = {}, html_options = {})
options[:length] ||= 40
if user_group.personal?
- self.user_ll_link(user_group.personal_user,
+ self.user_link(user_group.personal_user,
options.merge(:no_you => true), html_options)
else
link_to truncate_options(user_group.name, options),
Modified: trunk/app/models/const/global_config.rb
===================================================================
--- trunk/app/models/const/global_config.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/models/const/global_config.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -10,6 +10,6 @@
DONE = 5
TAG_KINDS = [:main_page, :user, :user_group, :peer_group, :replace,
- :untagged, :sandbox]
+ :untagged, :sandbox, :blog]
end
end
Modified: trunk/app/models/tag.rb
===================================================================
--- trunk/app/models/tag.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/models/tag.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -78,6 +78,12 @@
return GlobalConfig.sandbox_tag
end
+ # Returns the blog tag.
+ #
+ def self.blog
+ return GlobalConfig.blog_tag
+ end
+
### Parsing
# Parses a tag from a tag_string.
Modified: trunk/app/models/user.rb
===================================================================
--- trunk/app/models/user.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/models/user.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -56,7 +56,7 @@
before_validation_on_create :set_home_page_tag, :set_unix_name
# see HomePageModule and UnixNameModule
validate :name_not_reserved, :normalize_openid_identifier
- before_create :assert_persistence_token
+ before_create :assert_persistence_token, :set_blog_title
after_create :create_personal_user_group, :create_prefs_profiles, :create_home_page
before_destroy :reset_dependents
after_destroy :destroy_home_pages
@@ -205,6 +205,12 @@
end
end
+ def set_blog_title
+ if self.blog_title.nil?
+ self.blog_title = t('m.user.blog_title')
+ end
+ end
+
# Creates the personal UserGroup.
#
def create_personal_user_group
Modified: trunk/app/views/annotations/edit.html.erb
===================================================================
--- trunk/app/views/annotations/edit.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/annotations/edit.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -34,7 +34,7 @@
</a>
<%= popover_listing(truncate(annotation.message, :length => 35),
:annotation => annotation) %> -
- <%= user_ll_link(annotation.user) %>
+ <%= user_link(annotation.user) %>
</li>
<% end %>
</ul>
Modified: trunk/app/views/changes/_list.html.erb
===================================================================
--- trunk/app/views/changes/_list.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/changes/_list.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -29,7 +29,7 @@
<%= (logi.current_logi_version.nr == 1 ? t('v.changes.created_by') :
t('v.changes.edited_by')) %>
</span>
- <span class="user"><%= user_ll_link(
+ <span class="user"><%= user_link(
logi.current_logi_version.editor) %></span>
<span class="link">
<%= t('v.changes.at') + ' ' + logi_ll_link(logi, :show => :link,
Modified: trunk/app/views/comments/_new.html.erb
===================================================================
--- trunk/app/views/comments/_new.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/comments/_new.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -1,20 +1,21 @@
<div id="<%= selected %>">
-<%= render :partial => 'logis/commenting_logis', :locals => {
- :logis => @logi.commenting_logis, :unfold_disabled => true} %>
-
-<% render :layout => 'application/panel_with_tabs_ajax', :locals => {:tabs => [
- {:text => t('v.comments.new_logi'), :name => "new_logi",
- :description => t('v.comments.create_new')},
- {:text => t('v.comments.existing_logi'), :name => "existing_logi",
- :description => t('v.comments.paste_perma_link')}],
- :selected => selected, :id => "new_comment",
- :update_selected => true} do %>
+<% if !@from_blog %>
+ <% render :layout => 'application/panel_with_tabs_ajax', :locals => {:tabs => [
+ {:text => t('v.comments.new_logi'), :name => "new_logi",
+ :description => t('v.comments.create_new')},
+ {:text => t('v.comments.existing_logi'), :name => "existing_logi",
+ :description => t('v.comments.paste_perma_link')}],
+ :selected => selected, :id => "new_comment",
+ :update_selected => true} do %>
+ <% end %>
<% end %>
<% remote_thorny_form_for(@logi,
:url => logi_comments_path(:force => true),
:html => {:method => :post, :id => "logi_form"}) do |form| %>
+ <%= hidden_field_tag :from_blog, @from_blog.to_s %>
+
<% if selected == "new_logi" %>
<%= show_errors 'logi_version','logi' %>
Modified: trunk/app/views/external_links/edit.html.erb
===================================================================
--- trunk/app/views/external_links/edit.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/external_links/edit.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -33,7 +33,7 @@
</a>
<%= popover_listing(truncate(external_link.text, :length => 35),
:external_link => external_link) %> -
- <%= user_ll_link(external_link.user) %>
+ <%= user_link(external_link.user) %>
</li>
<% end %>
</ul>
Modified: trunk/app/views/invitations/edit.html.erb
===================================================================
--- trunk/app/views/invitations/edit.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/invitations/edit.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -5,11 +5,11 @@
<li>
<% if @invitation.role == Const::PeerGroupMembership::ADMIN %>
<%= t 'v.invitations.co_founder',
- :user => user_ll_link(@invitation.creator_user),
+ :user => user_link(@invitation.creator_user),
:group => peer_group_ll_link(@invitation.peer_group) %>
<% else %>
<%= t 'v.invitations.join',
- :user => user_ll_link(@invitation.creator_user),
+ :user => user_link(@invitation.creator_user),
:group => peer_group_ll_link(@invitation.peer_group) %>
<% end %>
</li>
Modified: trunk/app/views/layouts/_dbr_header.html.erb
===================================================================
--- trunk/app/views/layouts/_dbr_header.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/layouts/_dbr_header.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -16,7 +16,7 @@
<%= link_to t('v.layouts.login'), new_user_session_url %>
<% else %>
<%= t 'v.layouts.welcome', :name => truncate(current_user.name, :length => 15) %> |
- <%= link_to t('v.layouts.user_page'), user_ll_url(current_user) %> |
+ <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
<%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
<%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %>
<% end %>
Modified: trunk/app/views/layouts/_header.html.erb
===================================================================
--- trunk/app/views/layouts/_header.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/layouts/_header.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -23,7 +23,11 @@
</div>
<div id="header">
<div style="float:left">
- <img src="/images/header_background.png" width="6" height="68"/>
+ <% if local_assigns[:user_page] %>
+ <img src="/images/user_header_background.png" width="6" height="80"/>
+ <% else %>
+ <img src="/images/header_background.png" width="6" height="68"/>
+ <% end %>
</div>
<div id="header_content">
<% if local_assigns[:user_page] %>
@@ -34,13 +38,17 @@
<div id="header_text">
<div id="site_link">
<% if local_assigns[:user_page] %>
- <%= link_to(@user.name, @user, :class => 'sitename') %>
+ <%= link_to(@user.blog_title, @user, :class => 'sitename') %>
<% else %>
<%= site_link(:length => 17) %>
<% end %>
</div>
<div id="title_line">
- <%= t 'v.layouts.title_line' %>
+ <% if local_assigns[:user_page] %>
+ <%= by_author(@user) %>
+ <% else %>
+ <%= t 'v.layouts.title_line' %>
+ <% end %>
</div>
</div>
</div>
@@ -54,16 +62,18 @@
:class => 'go_button' %>
<% end %>
</div>
+ <% end %>
<div id="sessions">
<% if current_user.anonymous? %>
<%= link_to t('v.layouts.signup'), new_user_url %> |
<%= link_to t('v.layouts.login'), new_user_session_url %> |
<% else %>
- <%= link_to t('v.layouts.user_page'), user_ll_url(current_user) %> |
+ <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
<%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
<%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %> |
<% end %>
</div>
+ <% if !local_assigns[:user_page] %>
<% if !local_assigns[:tabs_disabled] %>
<%= render :partial => 'layouts/tabs' %>
<% end %>
Modified: trunk/app/views/layouts/_lirmm_header.html.erb
===================================================================
--- trunk/app/views/layouts/_lirmm_header.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/layouts/_lirmm_header.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -26,7 +26,7 @@
<%= link_to t('v.layouts.'), new_user_url %>
<% else %>
<%= t 'v.layouts.welcome', :name => truncate(current_user.name, :length => 15) %> |
- <%= link_to t('v.layouts.user_page'), user_ll_url(current_user) %> |
+ <%= link_to t('v.layouts.user_page'), user_url(current_user) %> |
<%= link_to t('v.layouts.preferences'), edit_user_url(current_user) %> |
<%= link_to t('v.layouts.logout'), user_session_path, :method => :delete %>
<% end %>
Modified: trunk/app/views/links/edit.html.erb
===================================================================
--- trunk/app/views/links/edit.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/links/edit.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -32,7 +32,7 @@
<%= image_tag 'remove_cross.png' %> ]
</a>
<%= popover_listing(pre_truncate(link.to_s(:for => :show),
- :length => 30), :link => link) %> - <%= user_ll_link(link.user) %>
+ :length => 30), :link => link) %> - <%= user_link(link.user) %>
</li>
<% end %>
</ul>
Modified: trunk/app/views/logi_versions/show.html.erb
===================================================================
--- trunk/app/views/logi_versions/show.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/logi_versions/show.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -25,7 +25,7 @@
<% minutes = (((now - logi_version.created_at) / 60) - days_ago * 1440).round %>
<%= hours_or_minutes_ago(days_ago, minutes) %>
- by <%= user_ll_link(logi_version.editor) %>,
+ by <%= user_link(logi_version.editor) %>,
<%= logi_version_ll_link(logi_version) %>
<% %>
</li>
Modified: trunk/app/views/logis/_commenting_logis.html.erb
===================================================================
--- trunk/app/views/logis/_commenting_logis.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/logis/_commenting_logis.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -1,27 +1,23 @@
<% render :layout => 'application/panel_with_header',
- :locals => {:title => t('v.logis.commenting'), :id => "commenting"} do %>
- <% if !local_assigns[:unfold_disabled] %>
- <div class="mirrored_notice_cloud"><%= t 'v.logis.in_depth_response' %></div>
- <div class="description">
- <p><%= t 'v.logis.count_comments', :count => logis.size %></p>
- </div>
- <% end %>
+ :locals => {:title => t('v.logis.commenting'), :id => "commenting"} do %>
+ <div class="mirrored_notice_cloud"><%= t 'v.logis.in_depth_response' %></div>
+ <div class="description">
+ <p><%= t 'v.logis.count_comments', :count => logis.size %></p>
+ </div>
<!--
<%= button_to t('v.logis.create_and_link'), new_logi_logi_inserts_url(@logi,
:selected => 'link', :link_selected => 'linked_logi'),
:class => 'insert_button', :tabindex => 2 %>
-->
- <% if !local_assigns[:unfold_disabled] %>
- <textarea id="fast_reply_area" class="unloaded_editor"
- ><%= t 'v.logis.click_load_editor' %></textarea>
- <div class="spacer"></div>
- <%= toggle_button_to_remote t('v.logis.load_editor'), {
- :update => "comment_area", :url => new_logi_comments_url(@logi),
- :method => :get},
- :class => 'unfold_button', :disabled => local_assigns[:unfold_disabled],
- :tabindex => 3 %>
- <% javascript_tag do -%>
- initFakeEditor('fast_reply_area', 'EditorDiv', '<%= new_logi_comments_url(@logi) %>');
- <% end -%>
- <% end %>
+ <textarea id="fast_reply_area" class="unloaded_editor"
+ ><%= t 'v.logis.click_load_editor' %></textarea>
+ <div class="spacer"></div>
+ <%= toggle_button_to_remote t('v.logis.load_editor'), {
+ :update => "comment_area", :url => new_logi_comments_url(@logi),
+ :method => :get},
+ :class => 'unfold_button', :disabled => local_assigns[:unfold_disabled],
+ :tabindex => 3 %>
+ <% javascript_tag do -%>
+ initFakeEditor('fast_reply_area', 'EditorDiv', '<%= new_logi_comments_url(@logi) %>');
+ <% end -%>
<% end %>
Modified: trunk/app/views/logis/_tag_list.html.erb
===================================================================
--- trunk/app/views/logis/_tag_list.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/logis/_tag_list.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -2,6 +2,9 @@
<%= render :partial => 'logis/clear_button', :locals => {:name => name,
:button_text => local_assigns[:clear_button_text]} %>
</div>
+<% if !local_assigns[:without_spacer] %>
+ <div class="spacer"></div>
+<% end %>
<div id="<%= name %>" class="tags_container">
<!-- Filled via js -->
</div>
Modified: trunk/app/views/logis/printer_friendly.html.erb
===================================================================
--- trunk/app/views/logis/printer_friendly.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/logis/printer_friendly.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -14,7 +14,7 @@
<div id="logi_meta"><div class="inner">
<div id="logi_other">
<h1><%= @logi_version.title %></h1>
- <span class="author left"><em>by:</em> <%= user_ll_link(@logi.creator, :length => 20) %></span>
+ <span class="author left"><em>by:</em> <%= user_link(@logi.creator, :length => 20) %></span>
</div>
<div class="hr"></div>
</div></div>
Modified: trunk/app/views/peer_groups/_activity.html.erb
===================================================================
--- trunk/app/views/peer_groups/_activity.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/peer_groups/_activity.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -12,7 +12,7 @@
</tr>
<% peer_group.memberships.best.all(:limit => 10).each do |membership| %>
<tr>
- <td class="user"><%= user_ll_link(membership.user, :length => 15) %></td>
+ <td class="user"><%= user_link(membership.user, :length => 15) %></td>
<td class="percentile"><%= number_to_percentage(membership.percentile,
:precision => 0) %></td>
</tr>
Modified: trunk/app/views/remarks/edit.html.erb
===================================================================
--- trunk/app/views/remarks/edit.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/remarks/edit.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -30,7 +30,7 @@
[ <span class="action">delete</span> <%= image_tag 'remove_cross.png' %> ]
</a>
<%= popover_listing(truncate(remark.message, :length => 35), :remark => remark) %> -
- <%= user_ll_link(remark.user) %>
+ <%= user_link(remark.user) %>
</li>
<% end %>
</ul>
Modified: trunk/app/views/tags/_edit.html.erb
===================================================================
--- trunk/app/views/tags/_edit.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/tags/_edit.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -1,9 +1,5 @@
<% render :layout => 'application/panel', :locals => {:id => name} do %>
<label><%= t('v.tags.tags_label') %></label>
- <%= button_to_function t('v.tags.clear_all'),
- 'window.' + name + '_list.remove_all_tags(); window.' + name + '_list.submit()',
- :class => 'cancel_button' %>
- <div class="spacer"></div>
<%= render :partial => 'logis/tag_list', :locals => {:name => name + '_list',
:link => link,
:param_name => 'check_ll_link_string', :without_form => true} %>
Added: trunk/app/views/users/_unfoldable_editor.html.erb
===================================================================
--- trunk/app/views/users/_unfoldable_editor.html.erb (rev 0)
+++ trunk/app/views/users/_unfoldable_editor.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -0,0 +1,16 @@
+<% render :layout => 'application/panel_with_header',
+ :locals => {:title => t('v.users.new_logi'), :id => "commenting"} do %>
+ <div class="mirrored_notice_cloud"><%= t 'v.users.post_new' %></div>
+ <textarea id="fast_reply_area" class="unloaded_editor"
+ ><%= t 'v.logis.click_load_editor' %></textarea>
+ <div class="spacer"></div>
+ <%= toggle_button_to_remote t('v.logis.load_editor'), {
+ :update => "comment_area", :url => new_logi_comments_url(@logi,
+ :from_blog => 'true'), :method => :get},
+ :class => 'unfold_button', :disabled => local_assigns[:unfold_disabled],
+ :tabindex => 3 %>
+ <% javascript_tag do -%>
+ initFakeEditor('fast_reply_area', 'EditorDiv', '<%= new_logi_comments_url(@logi,
+ :from_blog => true) %>');
+ <% end -%>
+<% end %>
Modified: trunk/app/views/users/_user.html.erb
===================================================================
--- trunk/app/views/users/_user.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/users/_user.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -1,8 +1,8 @@
<div class="user inner_panel">
<div class="panel_content_padding">
- <%= link_to gravatar_for(user, :size => 80), user_ll_url(user) %>
+ <%= link_to gravatar_for(user, :size => 80), user_url(user) %>
<div class="user_name">
- <%= user_ll_link(user, :no_you => true, :length => 15) %>
+ <%= user_link(user, :no_you => true, :length => 15) %>
</div>
</div>
</div>
Modified: trunk/app/views/users/show.html.erb
===================================================================
--- trunk/app/views/users/show.html.erb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/app/views/users/show.html.erb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -1,3 +1,9 @@
+<% if current_user == @user %>
+ <div id="comment_area">
+ <%= render :partial => 'unfoldable_editor' %>
+ </div>
+<% end %>
+
<div id="created_by_user">
<% if !@logis.empty? %>
<%= render :partial => 'logis/snippets_pagination', :locals => {:logis => @logis} %>
Modified: trunk/config/locales/en.yml
===================================================================
--- trunk/config/locales/en.yml 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/config/locales/en.yml 2010-06-23 15:43:59 UTC (rev 1728)
@@ -471,6 +471,7 @@
error_capital_letter: "must start with a capital letter."
home_body: "This is {{name}}s user page."
home_title: "About {{name}}"
+ blog_title: "A logi blog"
user_group:
home_body: "This is the homepage of the {{name}} usergroup."
home_title: "Home of the {{name}} usergroup."
@@ -914,6 +915,7 @@
api_key: "API key"
api_key_is_label: "Your API-key is:"
change_account_settings: "You can change your account settings."
+ post_new: "Post a new logi to your logi blog"
create_edit_invite_peer_groups: "Create, edit and invite people to peergroups."
created_logis_label: "Created logis:"
default_peer_group: "Default peergroup"
@@ -931,6 +933,7 @@
leave_blank: "Leave blank/unchanged any field you don't want to change."
link_label: "Link:"
normal: Normal
+ new_logi: "New logi"
openid_here: "If you don't have an {{explain_open}}OpenID{{link_close}} yet, you can sign up for one {{signup_open}}here{{link_close}}"
or_signup_openid: "Or signup with OpenID."
password_confirmation_label: "Password confirmation:"
Added: trunk/db/migrate/20100623093032_add_blogs.rb
===================================================================
--- trunk/db/migrate/20100623093032_add_blogs.rb (rev 0)
+++ trunk/db/migrate/20100623093032_add_blogs.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -0,0 +1,26 @@
+class AddBlogs < ActiveRecord::Migration
+ def self.up
+ add_column :users, :blog_title, :string, :null => false
+ add_column :global_configs, :blog_tag_string, :string, :null => false
+
+ if GlobalConfig.available?
+ AddBlogs.update
+ end
+ end
+
+ def self.down
+ raise 'No way back'
+ end
+
+ def self.update
+ g_c = GlobalConfig.find(:first)
+ # change as needed
+ g_c.blog_tag = Tag.from_s('Blog')
+ g_c.save
+
+ User.find(:all).each do |u|
+ u.blog_title = "A logi blog"
+ u.save
+ end
+ end
+end
Modified: trunk/db/schema.rb
===================================================================
--- trunk/db/schema.rb 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/db/schema.rb 2010-06-23 15:43:59 UTC (rev 1728)
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20100614144931) do
+ActiveRecord::Schema.define(:version => 20100623093032) do
create_table "acts_as_xapian_jobs", :force => true do |t|
t.string "model", :null => false
@@ -101,6 +101,7 @@
t.string "footer_partial", :null => false
t.integer "maximum_message_size", :null => false
t.string "custom_js"
+ t.string "blog_tag_string", :null => false
end
create_table "invitations", :force => true do |t|
@@ -284,6 +285,7 @@
t.datetime "last_login_at"
t.string "single_access_token", :null => false
t.string "unix_name", :null => false
+ t.string "blog_title", :null => false
end
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
Modified: trunk/public/images/header_background.png
===================================================================
(Binary files differ)
Modified: trunk/public/images/logo.png
===================================================================
(Binary files differ)
Modified: trunk/public/images/logo.svg
===================================================================
--- trunk/public/images/logo.svg 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/public/images/logo.svg 2010-06-23 15:43:59 UTC (rev 1728)
@@ -9,15 +9,15 @@
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"
+ width="42"
+ height="60"
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:export-filename="/home/wybo/logilogi/trunk/public/images/logo.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0">
<defs
@@ -69,26 +69,26 @@
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-548)">
+ transform="translate(0,-540)">
<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"
+ style="fill:#989cd7;fill-opacity:1;stroke:#989cd7;stroke-width:0.12576142;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 32.048098,599.84327 c 0.155867,-0.79303 -8.135679,-2.74103 -12.441949,-3.69443 -4.433063,-0.98144 -4.485224,-0.98576 -6.772884,-1.39365 -2.589272,-0.4617 -4.0622786,-0.72335 -5.3720239,-1.20783 -0.7543559,-0.42096 -1.2539752,-0.22972 -1.2141932,-1.65401 0.026583,-0.95191 0.031469,-2.94016 0.01099,-4.41834 -0.1003436,-7.21525 -0.063783,-10.18314 0.13292,-10.80078 0.1183692,-0.37164 0.1143961,-2.34005 -0.00846,-4.37422 -0.123235,-2.0342 -0.1578317,-4.16461 -0.07684,-4.73426 0.080973,-0.56964 0.1307784,-2.89808 0.1106853,-5.17426 -0.020103,-2.27621 0.071111,-5.30498 0.2026676,-6.7306 l 0.2392653,-2.59206 -2.2918406,-1.2827 c -3.381662,-1.95729 -4.65714859,-0.82232 -4.47735448,2.5868 -0.10952067,8.17029 0.47268772,16.39173 0.19256958,24.55476 -0.0851998,1.25304 -0.0690437,3.94815 0.0359771,5.98918 0.18567458,3.61074 0.17877033,5.20618 -0.0397354,9.20304 -0.10361176,1.8953 -0.0707335,1.94596 1.6664874,2.56634 1.5084488,0.5387 4.7347776,0.96626 11.7465913,1.55679 0.779812,0.0656 2.456774,0.25232 3.726567,0.41475 2.830444,0.36201 7.883159,0.75426 8.294044,0.82214 1.970646,0.32559 6.283968,0.63324 6.337024,0.36334 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"
+ style="fill:#e0e1f3;fill-opacity:1;stroke:#e0e1f3;stroke-width:0.12576142;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ d="m 37.873335,599.92035 c -0.332816,-0.86428 -3.957737,-3.12553 -14.301247,-8.68886 -3.996522,-2.14952 -4.770154,-2.30014 -4.702747,-4.54598 0.550787,-18.34927 0.524382,-38.73085 -0.0512,-39.54461 -1.05888,-1.49703 -6.129508,-3.51324 -6.633523,-2.63768 -0.22339,0.38805 -0.434249,4.2862 -0.46863,8.66259 -0.03437,4.37638 -0.07722,10.02921 -0.09509,12.56186 -0.01793,2.53263 -0.05195,6.8003 -0.07562,9.48365 -0.09328,10.58285 0.03428,16.22089 0.375671,16.60938 0.196626,0.22379 1.593913,0.58752 3.105085,0.80828 2.635714,0.38511 5.34962,1.44641 15.078026,4.70546 2.116733,0.70913 8.091545,3.42276 7.769261,2.58591 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"
+ style="fill:#9cbd86;fill-opacity:1;stroke:#9cbd86;stroke-width:0.12576146;stroke-opacity:1"
+ d="m 41.302725,576.79106 -0.07591,-23.21275 -2.215049,-2.81242 C 34.804258,545.42374 27.0109,539.4775 25.712645,540.61883 c -0.312132,0.27436 -0.563636,2.16325 -0.558921,4.19751 0.04331,18.66416 0.129932,37.11563 0.184848,39.3686 l 0.06707,2.75174 2.490158,1.42649 c 3.340369,1.91349 6.804346,4.88031 10.153403,8.69625 1.522455,1.73466 2.894385,3.1068 3.048714,3.04917 0.154376,-0.0577 0.246509,-10.55051 0.204772,-23.31753 z"
id="path5439"
inkscape:export-filename="/home/wybo/logilogi/docs/logo/book_logo.png"
inkscape:export-xdpi="299.92236"
Modified: trunk/public/images/svgs/header_background.svg
===================================================================
--- trunk/public/images/svgs/header_background.svg 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/public/images/svgs/header_background.svg 2010-06-23 15:43:59 UTC (rev 1728)
@@ -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#"
@@ -10,10 +11,10 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="4"
- height="68"
+ height="80"
id="svg4226"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
version="1.0"
sodipodi:docname="header_background.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -45,7 +46,7 @@
xlink:href="#linearGradient3406"
id="linearGradient4242"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(3.9064719e-3,0,0,0.9855895,-1.3765839,-45.161179)"
+ gradientTransform="matrix(0.00390647,0,0,1.1595171,-1.3765839,-65.130799)"
x1="864.35638"
y1="114.81573"
x2="864.35638"
@@ -63,14 +64,15 @@
inkscape:pageshadow="2"
inkscape:zoom="7.9195959"
inkscape:cx="0.04773252"
- inkscape:cy="22.919193"
+ inkscape:cy="27.969956"
inkscape:document-units="px"
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="metadata4231">
<rdf:RDF>
@@ -85,14 +87,15 @@
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
- id="layer1">
+ id="layer1"
+ transform="translate(0,12)">
<rect
- style="opacity:1;fill:url(#linearGradient4242);fill-opacity:1;stroke:none;stroke-width:2.69644189000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+ style="fill:url(#linearGradient4242);fill-opacity:1;stroke:none;display:inline"
id="rect2406"
width="4"
- height="68"
+ height="80"
x="0"
- y="2.553513e-15"
+ y="-12"
ry="0"
rx="0" />
</g>
Added: trunk/public/images/user_header_background.png
===================================================================
(Binary files differ)
Property changes on: trunk/public/images/user_header_background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/public/stylesheets/logilogi.css
===================================================================
--- trunk/public/stylesheets/logilogi.css 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/public/stylesheets/logilogi.css 2010-06-23 15:43:59 UTC (rev 1728)
@@ -82,8 +82,12 @@
position: relative;
background-position: 0 0;
background-image: url("/images/header_background.png");
- height: 68px;
+ height: 80px;
}
+#users_show #header {
+ background-image: url("/images/user_header_background.png");
+ height: 80px;
+}
#content {
width: 36em;
float: left;
@@ -557,17 +561,17 @@
#header_content img {
float: left;
padding: 1em 0 0 1.4em;
- margin: -0.5em 0.8em 0em 0.2em;
+ margin: -0.15em 0.8em 0em 0.5em;
}
-#header_content img.avatar {
- margin: -0.65em 0.8em 0em 0.45em;
+#users_show a.user_link {
+ color: #fff;
}
#header_text {
float: left;
}
#site_link {
float: left;
- margin-top: -0.1em;
+ margin-top: 0.4em;
margin-bottom: -0.2em;
}
#site_link a.sitename {
@@ -618,7 +622,7 @@
width: 8em;
}
#top_search #top_search_button {
- margin-top: 0.4em;
+ margin-top: 0.35em;
margin-left: 0.5em;
float: left;
}
@@ -866,10 +870,13 @@
color: #5f2f8a;
}
.tag_separator {
- margin-top: 0.4em;
+ margin-top: 0.3em;
line-height: 1.3em;
font-size: 1.9em;
}
+#navigation_bar .tag_separator {
+ margin-top: 0.4em;
+}
.equal_author {
margin-top: 0.65em;
line-height: 1.3em;
@@ -1193,33 +1200,30 @@
margin-right: 0.5em;
line-height: 1.65em;
}
-#advanced_area input.tag_list,
-.blank input.tag_list {
- margin-top: 1em;
- font-size: 1em;
+#search_button,
+div.tag_list {
+ margin-left: 0.5em;
+ float: left;
}
-#advanced_area .add_tag_form,
-.blank .add_tag_form {
- float: right;
- clear: both;
-}
-#navigation_bar #search_query,
+#search_query,
input.tag_list {
margin-top: 1em;
padding: 0.3em;
float: left;
margin-left: 0.3em;
}
+input.tag_list {
+ margin-top: 1em;
+ font-size: 1em;
+}
+#logi_tags_edit .add_button {
+ margin-top: 0.65em;
+}
#navigation_bar #search_button,
#navigation_bar .button,
-div.tag_list {
+#navigation_bar div.tag_list {
margin-top: 0.9em;
}
-#navigation_bar #search_button,
-div.tag_list {
- margin-left: 0.5em;
- float: left;
-}
/* logi browse */
@@ -1262,6 +1266,11 @@
#logi_edit {
height: 613px;
}
+#logi_insert #logi_edit,
+#users_show #logi_edit,
+#logis_show #logi_edit {
+ height: 558px;
+}
#logi_edit .panel_content_padding {
padding: 1.5em 1.1em 2em 1.1em;
}
@@ -1274,12 +1283,19 @@
clear: none;
}
input#logi_edit_title {
+ width: 442px;
+ font-size: 1.2em;
+ padding: 0.5em;
+ margin: 0.5em 0em 0em 0em;
+}
+#logi_edit input#logi_edit_title,
+#logi_new input#logi_edit_title {
width: 424px;
font-size: 1.6em;
margin: 0em 0em 0.5em 0em;
- padding: 0.5em;
}
-#title input.logi_title {
+#logi_edit #title input.logi_title,
+#logi_new #title input.logi_title {
width: 453px;
margin: 0.5em 0em 0.2em 0em;
}
Modified: trunk/test/fixtures/users.yml
===================================================================
--- trunk/test/fixtures/users.yml 2010-06-22 21:53:54 UTC (rev 1727)
+++ trunk/test/fixtures/users.yml 2010-06-23 15:43:59 UTC (rev 1728)
@@ -10,6 +10,7 @@
persistence_token: 'sfsdfsdfsdfs'
perishable_token: 'dsgfsfsf'
single_access_token: 'BVhfPnwhxrZPHXYbygf5'
+ blog_title: "A logi blog"
last_login_at: <%= 2.days.ago.to_s(:db) %>
created_at: <%= 10.days.ago.to_s(:db) %>
john_johnson:
@@ -24,6 +25,7 @@
persistence_token: 'sfsdfsdfsdfsi'
perishable_token: 'dsgfsfsfi'
single_access_token: '5VhfPnwhxrZPHXYbygf5'
+ blog_title: "A logi blog"
last_login_at: <%= 1.days.ago.to_s(:db) %>
created_at: <%= 10.days.ago.to_s(:db) %>
johnny_runner:
@@ -39,6 +41,7 @@
persistence_token: '93b8786bfbb7c4ff183f5d6dc40b14c249a156e5c64d52ff851dd4c25c1e2e5c666db6b56e0fac3b9a26a8bb9cc57a67241dfd6c5c66299867fc2881e1be7c30'
perishable_token: 'jGgMkIyVq5jQfaUJC0P5'
single_access_token: '6VhfPnwhxrZPHXYbygf5'
+ blog_title: "A logi blog"
last_login_at: <%= 1.hour.ago.to_s(:db) %>
created_at: <%= 1.hour.ago.to_s(:db) %>
eddy_crawler:
@@ -55,5 +58,6 @@
persistence_token: '15d276c2ce1f13576acc936f0c33cfff05e89e76f723870f6c8559c47333661e71f8337d94a9e068314a75b6dd792e03fb1dace0e85bbc94f0de8cce48f8046a'
perishable_token: '4Lefv8iQdlG67JDQo7kw'
single_access_token: '6VhfPn5hxrZPHXYbygf5'
+ blog_title: "A logi blog"
last_login_at: <%= 3.hours.ago.to_s(:db) %>
created_at: <%= 3.hours.ago.to_s(:db) %>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|