modify the style of the projects witch show

app/controllers/users_controller.rb

@@ -64,6 +64,8 @@ class UsersController < ApplicationController
 
     events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20)
     @events_by_day = events.group_by(&:event_date)
+    @state = 0
+
 
   #add by huang
     unless User.current.admin?
@@ -379,49 +381,7 @@ class UsersController < ApplicationController
     end
   end
   
-
-  ### modified by fq
   def show
-    # has = {
-      # "show_issues" => true,
-      # "show_changesets" => true,
-      # "show_news" => true,
-      # "show_messages" => true,
-      # "show_bids" => true,
-    # }
-    #####fq
-  
-    # JournalsForMessage.reference_message(@user.id)
-    # show projects based on current user visibility
-    # @memberships = @user.memberships.all(:conditions => Project.visible_condition(User.current))
-    
-    
-    # if @user == User.current
-      # events = []
-      # activity = Redmine::Activity::Fetcher.new(User.current, :author => User.current)
-      # activity.scope_select {|t| !has["show_#{t}"].nil?}
-      # events += activity.events(nil, nil, :limit => 10)
-      # @watcher = User.watched_by(@user)
-      # for user in @watcher
-        # activity = Redmine::Activity::Fetcher.new(User.current, :author => user)
-        # activity.scope_select {|t| !has["show_#{t}"].nil?}
-        # events += activity.events(nil, nil, :limit => 10)
-      # end
-    # else
-      # activity = Redmine::Activity::Fetcher.new(User.current, :author => @user)
-      # activity.scope_select {|t| !has["show_#{t}"].nil?}
-      # events = activity.events(nil, nil, :limit => 10)
-    # end
-    # @events = []
-    # @events_by_day = events.group_by(&:event_date)
-    # @events_by_day.keys.sort.reverse.each do |day|
-      # @events += @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime}
-    # end         
-    # @offset, @limit = api_offset_and_limit({:limit => 10})
-    # @activity_count = @events.size
-    # @activity_pages = Paginator.new @activity_count, @limit, params['page']
-    # @offset ||= @activity_pages.offset 
-    # @events_by_day_ = @events.slice(@offset,@limit)
     case params[:type]
     when "1"
       if @user == User.current
@@ -570,6 +530,7 @@ class UsersController < ApplicationController
           @watch_projects << Project.find(obj.watchable_id)
       end
     end
+    @state = 1
     respond_to do |format|
       format.html {
         render :layout => 'base_users'

app/helpers/users_helper.rb

@@ -92,6 +92,20 @@ module UsersHelper
     content_tag('div', content, :class => "pagination")
   end
   
+  def watch_projects(state)
+    content = ''.html_safe
+    case state
+    when 0
+      s = content_tag('span', l(:label_project_take), :class => "current-page")
+      content << content_tag('li', s)
+      content << content_tag('li', link_to(l(:label_has_watched_project), {:controller => 'users', :action => 'watch_projects', :type => 1}))
+    when 1
+      s = content_tag('span', l(:label_has_watched_project), :class => "current-page")
+      content << content_tag('li', link_to(l(:label_project_take), {:controller => 'users', :action => 'user_projects'}))
+      content << content_tag('li', s, :class => "current-page")
+      end
+    content_tag('div', content, :class => "pagination")
+  end
   def user_course(state)
     content = ''.html_safe
   if @user != User.current
@@ -193,5 +207,4 @@ def sort_user(state, project_type)
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs_enterprise")
   end  
-#end
 end

app/models/project.rb

@@ -89,7 +89,7 @@ class Project < ActiveRecord::Base
 
   
   has_many :tags, :through => :project_tags, :class_name => 'Tag'
-  has_many :project_tags, :class_name => 'ProjectTags', :dependent => :destroy        
+  has_many :project_tags, :class_name => 'ProjectTags' 
 
   acts_as_nested_set :order => 'name', :dependent => :destroy
   acts_as_attachable :view_permission => :view_files,

app/views/users/user_projects.html.erb

@@ -1,11 +1,10 @@
 <!--add by huang-->
-<p>
-<strong><%= l(:label_project_take)%>
-  <%= link_to l(:label_has_watched_project) , {:controller => 'users', :action => 'watch_projects', :id => @user.id}%></strong>
-<% unless @memberships.empty? %>
 <% if @user == User.current %>
-	<span style="margin-left: 300px"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></sapn></p>
+	<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
 <% end %>
+<p><%= watch_projects @state%>
+
+<% unless @memberships.empty? %>
 <div class="content_frame">
 <ul class="user_project_sort">
 	<% for membership in @memberships %>

app/views/users/user_watchlist.html.erb

@@ -1,4 +1,3 @@
-<!--add by huang-->
 <h3><%= l(:label_user_watcher)%></h3>
 <div class="inf_user_image">
 	<% for user in User.watched_by(@user.id) %>

app/views/users/watch_projects.html.erb

@@ -1,13 +1,7 @@
-<table>
+<% if @user == User.current %>	
-<p><strong>
+		<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
-    <%= l(:label_has_watched_project)%>
+<% end %>
-	<%= link_to l(:label_project_take) , {:controller => 'users', :action => 'user_projects', :course => 0, :project_type => @project_type}%></strong>
+<%= watch_projects @state%>
-	<% if @user == User.current %>	
-		<span style="margin-left: 300px"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></span>
-	<% end %>
-	</td>
-</p>
-<table>
 <% unless @watch_projects.nil?&&watch_projects.project.nil? %>
 <% for watch_project in @watch_projects %>
 <table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">