修改《邮件系统》页面

Signed-off-by: alan <547533434@qq.com>

.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch

@@ -2,6 +2,7 @@
 <launchConfiguration type="com.aptana.js.debug.core.webbrowserLaunchConfigurationType">
 <booleanAttribute key="advancedRunEnabled" value="false"/>
 <booleanAttribute key="appendProjectName" value="true"/>
+<stringAttribute key="browserCmdLine" value=""/>
 <stringAttribute key="browserExecutable" value=""/>
 <stringAttribute key="browserNature" value="Firefox"/>
 <stringAttribute key="externalBaseUrl" value=""/>

.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch

@@ -2,6 +2,7 @@
 <launchConfiguration type="com.aptana.js.debug.core.webbrowserLaunchConfigurationType">
 <booleanAttribute key="advancedRunEnabled" value="false"/>
 <booleanAttribute key="appendProjectName" value="true"/>
+<stringAttribute key="browserCmdLine" value=""/>
 <stringAttribute key="browserExecutable" value="C:\Program Files (x86)\Internet Explorer\iexplore.exe"/>
 <stringAttribute key="browserNature" value="Internet Explorer"/>
 <stringAttribute key="externalBaseUrl" value=""/>

app/controllers/application_controller.rb

@@ -275,7 +275,12 @@ class ApplicationController < ActionController::Base
       end
     end
   end
+  def auth_login1(token = params[:token])
+    if(!User.current.logged? && !token.nil?)
 
+      User.current =try_to_autologin1
+    end
+  end
   def authorize_allowed(ctrl = params[:controller], action = params[:action], global = false)
     #modify by NWB
     if  @project

app/controllers/my_controller.rb

@@ -17,6 +17,9 @@
 
 class MyController < ApplicationController
   layout "users_base"
+  # edit
+  before_filter :auth_login1, :only => [:account]
+  #
   before_filter :require_login
 
   helper :issues

app/controllers/projects_controller.rb

@@ -31,14 +31,16 @@ class ProjectsController < ApplicationController
   menu_item :feedback, :only => :feedback
   menu_item l(:label_course_file), :only => :index
   menu_item l(:label_course_news), :only => :index
-  
 
+# edit
+  before_filter :authorize1, :only => [:show]
+#
   before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
   #此条勿删 课程相关权限  ,:new_homework,:homework,:feedback,,:member
-  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
+  before_filter :authorize, :only => [:settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches,:course]
   before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics, :watcherlist

app/controllers/users_controller.rb

@@ -29,6 +29,9 @@ class UsersController < ApplicationController
  
   #Ended by young
 
+  # edit
+  before_filter :auth_login1, :only => [:show]
+  #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
   before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info,
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,

app/models/mailer.rb

@@ -109,9 +109,14 @@ class Mailer < ActionMailer::Base
 
     token = Token.new(:user => User.find_by_mail(recipients), :action => 'autologin')
     token.save
-    @token = token
+     @token = token
      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
 
+ # edit
+     @issue_author_url = url_for(:controller  => 'users', :action => 'show', :id => issue.author_id,  :token => @token.value)
+     @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
+     @user_url = url_for(:controller  => 'my', :action => 'account', :user => User.find_by_mail(recipients) ,  :token => @token.value)
+ #
 
     cc = issue.watcher_recipients - issue.recipients
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"

app/views/layouts/mailer.html.erb

@@ -1,33 +1,46 @@
 <html>
 <head>
+<title>Trustie项目邮件</title>
+
+
+
+
 <style>
-body {
+body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-  font-family: Verdana, sans-serif;
+div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;}
-  font-size: 0.8em;
+div,img,tr,td,table{ border:0;}
-  color:#484848;
+table,tr,td{border:0;cellspacing:0; cellpadding:0;}
-}
+ol,ul,li{ list-style-type:none}
-h1, h3, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
+.cl{ clear:both; overflow:hidden; }
-h1 { font-size: 1.2em; }
+a{ text-decoration:none; }
-h3, h3 { font-size: 1.1em; }
+a:hover{ text-decoration:underline; }
-a, a:link, a:visited { color: #2A5685;}
+
-a:hover, a:active { color: #c61a1a; }
+.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
-a.wiki-anchor { display: none; }
+.mail a{color:#1b55a7; font-weight: bold; }
-hr {
+.mail_content{ margin-top:30px;}
-  width: 100%;
+.c_blue{ color:#1b55a7;}
-  height: 1px;
+.mail_box{ border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;}
-  background: #ccc;
+.mail_box_p{  float:left; display: block; width:527px;}
-  border: 0;
+a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;}
-}
+a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
-.footer {
+.mail_fujian{ float:left; width:527px; display: block; }
-  /*font-size: 0.8em;*/
+.mail_fujian a{ font-weight:normal; font-size:12px;}
-  /*font-style: italic;*/
+.mail_foot a{ font-size:12px; font-weight:normal;}
-}
+
+
+
 </style>
 </head>
 <body>
-<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span>
+ <div class="container">
-<%= yield %>
+	<div class="mail">
-<hr />
+    	<div class="mail_head">
-<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span>
+        	<p>亲爱的Trustie用户，您好！</p>
+        </div><!--mail_head end-->
+        <%= yield %>
+        <hr />
+        <div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div><!--mail_foot end-->
+    </div>
+  </div>
 </body>
 </html>

app/views/mailer/_issue.html.erb

@@ -1,15 +1,39 @@
-<h1><%= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1>
+<!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
-
+<p>
+      <span class="c_blue">
+        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
+     </span>在
+  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
+<div class="mail_box">
 <ul>
-<li><%=l(:field_author)%>: <%=h issue.author %></li>
+	<li><strong>标题：</strong><%= link_to(issue.subject, issue_url) %></li>
-<li><%=l(:field_status)%>: <%=h issue.status %></li>
+	<li><strong>来源：</strong><%= link_to(h("#{issue.project.name}"),@project_url) %><b>|&nbsp;</b>项目缺陷</li>
-<li><%=l(:field_priority)%>: <%=h issue.priority %></li>
+	<li><strong style="float:left;">内容：</strong>
-<li><%=l(:field_assigned_to)%>: <%=h issue.assigned_to %></li>
+                    	<p class="mail_box_p"><%= textilizable(issue, :description, :only_path => false) %></p>
-<li><%=l(:field_category)%>: <%=h issue.category %></li>
+    </li>
-<li><%=l(:field_fixed_version)%>: <%=h issue.fixed_version %></li>
+  <li><strong style="float:left;">附件：</strong>
-<% issue.custom_field_values.each do |c| %>
+    <p class="mail_fujian">
-  <li><%=h c.custom_field.name %>: <%=h show_value(c) %></li>
+      <% unless @issue.attachments.nil? %>
-<% end %>
+          <% @issue.attachments.each do |attach| %>
+          <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %></br>
+      <% end %>
+    <% end %>
+
+    </p>
+  </li>
 </ul>
+  <label  class="mail_reply"><%= link_to( "我要回复", issue_url) %></label>
+  <div class="cl"></div>
+</div>
+<!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
 
-<%= textilizable(issue, :description, :only_path => false) %>
+<li><%#=l(:field_status)%>: <%#=h issue.status %></li>
+<li><%#=l(:field_priority)%>: <%#=h issue.priority %></li>
+<li><%#=l(:field_assigned_to)%>: <%#=h issue.assigned_to %></li>
+<li><%#=l(:field_category)%>: <%#=h issue.category %></li>
+<li><%#=l(:field_fixed_version)%>: <%#=h issue.fixed_version %></li>
+-->
+<%# issue.custom_field_values.each do |c| %>
+<!--  <li><%#=h c.custom_field.name %>: <%#=h show_value(c) %></li>
+<%#end %>
+-->

app/views/mailer/issue_add.html.erb

@@ -1,15 +1,8 @@
+<div class="mail_content">
 
 
-<%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => h(@issue.author)) %>
+         <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<ul>
 
-    <% unless @issue.attachments.nil? %>
-  <% @issue.attachments.each do |attach| %>
-    <li>  <%= l(:label_attachment) %><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %></li>
-  <% end %>
-<% end %>
 
-</ul>
+</div>
-<hr />
 
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>

app/views/mailer/issue_add.text.erb

@@ -1,11 +1,11 @@
-<%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %>
+<%= link_to(h("#{@issue.author}"+"(#{@issue.author_id.firstname+@issue.author_id.lastname})"), @issue_author_url) %>在<%= link_to(h("#{@issue.project.name}"),@project_url) %>
-
+<%#= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %> !-->
+<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 <% @issue.attachments.each do |attach| %>
-   <%= l(:label_attachment) %>
      <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %> <%= l(:label_added) %>
 <% end %>
 
 ----------------------------------------
-
+<%= link_to( "我要回复", @issue_url) %>
-<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+ <%#=  render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>