Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/attachments_controller.rb

@@ -361,7 +361,7 @@ private
 
   def login_without_softapplication
     referer = request.headers['Referer']
-    require_login unless referer =~ /softapplication/
+    require_login unless referer =~ /softapplication/ || referer =~ /memos/
   end
 
   def  renderTag

app/controllers/contest_notification_controller.rb

@@ -1,4 +1,5 @@
 class ContestNotificationController < ApplicationController
+  layout 'contest_base'
   def show
     @notification = ContestNotification.find(params[:id])
   end

app/controllers/journals_controller.rb

@@ -54,6 +54,11 @@ class JournalsController < ApplicationController
     end
     (render_404; return false) unless @issue && @detail
     @diff = Redmine::Helpers::Diff.new(@detail.value, @detail.old_value)
+    respond_to do |format|
+      format.html {
+        render :layout => 'project_base'
+      }
+    end
   end
 
   def new

app/helpers/projects_helper.rb

@@ -181,7 +181,7 @@ module ProjectsHelper
           # unless project.is_public == 1
 
           if project.is_public != 1
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end
@@ -197,7 +197,7 @@ module ProjectsHelper
 
           if !project.is_public
           # end longjun
-            s = "<span class='private_project'>#{l(:lable_private)}</span>".html_safe
+            s = "<span class='private_project'>#{l(:label_private)}</span>".html_safe
           else
             s = "".html_safe
           end

app/views/memos/show.html.erb

@@ -23,7 +23,8 @@
 				)if !@memo.locked? && User.current.logged? %>			
 
 			<%= link_to(
-				image_tag('edit.png'),
+				#image_tag('edit.png'),
+                l(:button_edit),
 				{:action => 'edit', :id => @memo},
 				:method => 'get',
 				:title => l(:button_edit)