From 0d0a16fdcd0beafe14520435c3d10bb1e450a2d8 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 23 Oct 2014 14:36:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/my_controller.rb | 301 +----------------- app/views/contestnotifications/index.html.erb | 193 ++--------- .../courses/_join_private_course.html.erb | 118 ++----- app/views/wiki/edit.html.erb | 111 ++----- 4 files changed, 85 insertions(+), 638 deletions(-) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 742fe6857..69dda5be0 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -1,287 +1,3 @@ -<<<<<<< HEAD -# Redmine - project management software -# Copyright (C) 2006-2013 Jean-Philippe Lang -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -#+ -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -class MyController < ApplicationController - layout "users_base" - before_filter :require_login - - helper :issues - helper :users - helper :custom_fields - - BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues, - 'issuesreportedbyme' => :label_reported_issues, - 'issueswatched' => :label_watched_issues, - 'news' => :label_news_latest, - 'calendar' => :label_calendar, - 'documents' => :label_document_plural, - 'timelog' => :label_spent_time - }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze - - DEFAULT_LAYOUT = { 'left' => ['issuesassignedtome'], - 'right' => ['issuesreportedbyme'] - }.freeze - - def index - - page - render :action => 'page' - end - - # Show user's page - def page - @user = User.current - @Issues= Issue.visible.open. - where(:assigned_to_id => ([User.current.id] + User.current.group_ids)) - @limit = 10 - @feedback_count = @Issues.count - @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] - @offset ||= @feedback_pages.offset - @curse_attachments = @Issues[@offset, @limit] - - @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT - end - - def page2 - @limit = 10 - @user = User.current - @Issues= Issue.visible.open. - where(:assigned_to_id => ([User.current.id] + User.current.group_ids)) - @feedback_count = @Issues.count - @feedback_pages = Paginator.new @feedback_count, @limit, params['page'] - @offset ||= @feedback_pages.offset - @curse_attachments = @Issues[@offset, @limit] - @state = false - @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT - respond_to do |format| - format.js - end - end - - # Edit user's account - def account - @user = User.current - lg=@user.login - @pref = @user.pref - diskfile = disk_filename('User', @user.id) - diskfile1 = diskfile + 'temp' - if request.post? - @user.safe_attributes = params[:user] - @user.pref.attributes = params[:pref] - @user.pref[:no_self_notified] = (params[:no_self_notified] == '1') - @user.login = params[:login] - unless @user.user_extensions.nil? - if @user.user_extensions.identity == 2 - @user.firstname = params[:enterprise_name] - end - end - - @se = @user.extensions - @se.school_id = params[:occupation] if params[:occupation] - @se.gender = params[:gender] - @se.location = params[:province] if params[:province] - @se.location_city = params[:city] if params[:city] - @se.identity = params[:identity].to_i if params[:identity] - @se.technical_title = params[:technical_title] if params[:technical_title] - @se.student_id = params[:no] if params[:no] - - if @user.save && @se.save - # 头像保存 - if File.exist?(diskfile1) - if File.exist?(diskfile) - File.delete(diskfile) - end - File.open(diskfile1, "rb") do |f| - buffer = f.read(10) - if buffer != "DELETE" - File.open(diskfile1, "rb") do |f1| - File.open(diskfile, "wb") do |f| - buffer = "" - while (buffer = f1.read(8192)) - f.write(buffer) - end - end - end - - # File.rename(diskfile + 'temp',diskfile); - end - end - end - - # 确保文件被删除 - if File.exist?(diskfile1) - File.delete(diskfile1) - end - - @user.pref.save - @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : []) - set_language_if_valid @user.language - flash.now[:notice] = l(:notice_account_updated) - redirect_to user_url(@user) - return - else - # 确保文件被删除 - if File.exist?(diskfile1) - File.delete(diskfile1) - end - @user.login = lg - end - else - # 确保文件被删除 - if File.exist?(diskfile1) - File.delete(diskfile1) - end - end - end - - # Destroys user's account - def destroy - @user = User.current - unless @user.own_account_deletable? - redirect_to my_account_url - return - end - - if request.post? && params[:confirm] - @user.destroy - if @user.destroyed? - logout_user - flash.now[:notice] = l(:notice_account_deleted) - end - redirect_to home_url - end - end - - # Manage user's password - def password - @user = User.current - unless @user.change_password_allowed? - flash.now[:error] = l(:notice_can_t_change_password) - redirect_to my_account_url - return - end - if request.post? - if @user.check_password?(params[:password]) - @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation] - - if @user.save - flash.now[:notice] = l(:notice_account_password_updated) - redirect_to my_account_url - end - else - flash.now[:error] = l(:notice_account_wrong_password) - end - end - end - - # Create a new feeds key - def reset_rss_key - if request.post? - if User.current.rss_token - User.current.rss_token.destroy - User.current.reload - end - User.current.rss_key - flash[:notice] = l(:notice_feeds_access_key_reseted) - end - redirect_to my_account_url - end - - # Create a new API key - def reset_api_key - if request.post? - if User.current.api_token - User.current.api_token.destroy - User.current.reload - end - User.current.api_key - flash[:notice] = l(:notice_api_access_key_reseted) - end - redirect_to my_account_url - end - - # User's page layout configuration - def page_layout - @user = User.current - @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup - @block_options = [] - BLOCKS.each do |k, v| - unless %w(top left right).detect {|f| (@blocks[f] ||= []).include?(k)} - @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize] - end - end - end - - # Add a block to user's page - # The block is added on top of the page - # params[:block] : id of the block to add - def add_block - block = params[:block].to_s.underscore - if block.present? && BLOCKS.key?(block) - @user = User.current - layout = @user.pref[:my_page_layout] || {} - # remove if already present in a group - %w(top left right).each {|f| (layout[f] ||= []).delete block } - # add it on top - layout['top'].unshift block - @user.pref[:my_page_layout] = layout - @user.pref.save - end - redirect_to my_page_layout_url - end - - # Remove a block to user's page - # params[:block] : id of the block to remove - def remove_block - block = params[:block].to_s.underscore - @user = User.current - # remove block in all groups - layout = @user.pref[:my_page_layout] || {} - %w(top left right).each {|f| (layout[f] ||= []).delete block } - @user.pref[:my_page_layout] = layout - @user.pref.save - redirect_to my_page_layout_url - end - - # Change blocks order on user's page - # params[:group] : group to order (top, left or right) - # params[:list-(top|left|right)] : array of block ids of the group - def order_blocks - group = params[:group] - @user = User.current - if group.is_a?(String) - group_items = (params["blocks"] || []).collect(&:underscore) - group_items.each {|s| s.sub!(/^block_/, '')} - if group_items and group_items.is_a? Array - layout = @user.pref[:my_page_layout] || {} - # remove group blocks if they are presents in other groups - %w(top left right).each {|f| - layout[f] = (layout[f] || []) - group_items - } - layout[group] = group_items - @user.pref[:my_page_layout] = layout - @user.pref.save - end - end - render :nothing => true - end -end -======= # Redmine - project management software # Copyright (C) 2006-2013 Jean-Philippe Lang # @@ -314,17 +30,17 @@ class MyController < ApplicationController 'calendar' => :label_calendar, 'documents' => :label_document_plural, 'timelog' => :label_spent_time - }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze + }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze DEFAULT_LAYOUT = { 'left' => ['issuesassignedtome'], 'right' => ['issuesreportedbyme'] - }.freeze + }.freeze def index page render :action => 'page' - end + end # Show user's page def page @@ -374,10 +90,10 @@ class MyController < ApplicationController end end - @se = @user.extensions + @se = @user.extensions @se.school_id = params[:occupation] if params[:occupation] @se.gender = params[:gender] - @se.location = params[:province] if params[:province] + @se.location = params[:province] if params[:province] @se.location_city = params[:city] if params[:city] @se.identity = params[:identity].to_i if params[:identity] @se.technical_title = params[:technical_title] if params[:technical_title] @@ -392,7 +108,7 @@ class MyController < ApplicationController File.open(diskfile1, "rb") do |f| buffer = f.read(10) if buffer != "DELETE" - File.open(diskfile1, "rb") do |f1| + File.open(diskfile1, "rb") do |f1| File.open(diskfile, "wb") do |f| buffer = "" while (buffer = f1.read(8192)) @@ -401,7 +117,7 @@ class MyController < ApplicationController end end - # File.rename(diskfile + 'temp',diskfile); + # File.rename(diskfile + 'temp',diskfile); end end end @@ -461,7 +177,7 @@ class MyController < ApplicationController if request.post? if @user.check_password?(params[:password]) @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation] - + if @user.save flash.now[:notice] = l(:notice_account_password_updated) redirect_to my_account_url @@ -564,4 +280,3 @@ class MyController < ApplicationController render :nothing => true end end ->>>>>>> d2f4b38eb6fd68a67940b8ffe735d8f7437acde1 diff --git a/app/views/contestnotifications/index.html.erb b/app/views/contestnotifications/index.html.erb index 839da8de8..b8f733bf2 100644 --- a/app/views/contestnotifications/index.html.erb +++ b/app/views/contestnotifications/index.html.erb @@ -1,127 +1,3 @@ -<<<<<<< HEAD - - <%= l(:label_notification) %> - -<% if User.current.logged? && (User.current.admin? ||User.current == @contest.author) %> -<%= link_to(l(:bale_news_notice), - new_contest_contestnotification_path(@contest), - :class => 'icon icon-add', - :onclick => 'showAndScrollTo("add-contestnotifications", "contestnotifications_title"); return false;') %> -<% end %> -<% if @contest %> - -<% end %> -
- -
- - <%= image_tag(url_to_avatar(@contest.author), :class => "avatar")%> - - -

- <%= link_to(@contest.author.lastname+@contest.author.firstname, - user_path(@contest.author)) - %> - ：<%= @contest.name %>

-

- - <%= l(:label_bids_reward_method) %> - - <%= @contest.budget%> - - -

-
- <%= @contest.description %> -
- - <%= render :partial => "/praise_tread/praise_tread", - :locals => {:obj => @contest, - :show_flag => true, - :user_id =>User.current.id, - :horizontal => false} - %> - - -
- -
- -

- <% @contestnotificationss.each do |contestnotifications| %> - - - - - -
<%= link_to image_tag(url_to_avatar(contestnotifications.author), :class => "avatar"), user_path(contestnotifications.author) %> - - - - - - - - - - - - -
- <%= link_to_user(contestnotifications.author) if contestnotifications.respond_to?(:author) %> - <%= l(:label_project_notice) %><%= link_to h(contestnotifications.title), contest_contestnotification_path(@contest, contestnotifications) %> - - <%= link_to l(:button_edit), edit_contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> - <%= delete_link contest_contestnotification_path(@contest, contestnotifications) if (User.current.admin? && User.current.logged? )||(User.current == @contest.author && User.current.logged?) %> - -
- <%= textilizable(contestnotifications, :description) %>
<%= l :label_update_time %> -  <%= format_time(contestnotifications.created_at) %><%= link_to l(:label_check_comment), contest_contestnotification_path(@contest, contestnotifications) %><%#= "(#{l(:label_x_comments, :count => contestnotifications.notificationcomments_count)})" if contestnotifications.notificationcomments_count >= 0 %>
-
- <% end %> - -
- -
- - - <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> - <%= stylesheet_link_tag 'scm' %> - <% end %> - - <% html_title(l(:label_contest_notification)) -%> -
- - - -======= ->>>>>>> d2f4b38eb6fd68a67940b8ffe735d8f7437acde1 \ No newline at end of file diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb index f19a357ca..eaa325bb7 100644 --- a/app/views/courses/_join_private_course.html.erb +++ b/app/views/courses/_join_private_course.html.erb @@ -1,80 +1,3 @@ -<<<<<<< HEAD - - - - - 快速进入课程通道 - - - - - -
-
-
-

快速进入课程通道

-

只要持有课程ID和密码，就课快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！

-
-
- <%= form_tag({:controller => 'courses', - :action => 'join'}, - :remote => true, - :method => :post, - :id => 'new-watcher-form') do %> - - <% end%> -
-
-
- - - -======= @@ -107,11 +30,11 @@ .C_form a.btn:hover{ background:#ff821d;} @@ -128,21 +51,21 @@ :remote => true, :method => :post, :id => 'new-watcher-form') do %> - + <% end%> @@ -150,4 +73,3 @@ ->>>>>>> d2f4b38eb6fd68a67940b8ffe735d8f7437acde1 diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb index 16512beef..6154ca22d 100644 --- a/app/views/wiki/edit.html.erb +++ b/app/views/wiki/edit.html.erb @@ -1,67 +1,3 @@ -<<<<<<< HEAD -<%= wiki_page_breadcrumb(@page) %> - - -

- <%= h @page.pretty_title %> -

- -<%= form_for @content, :as => :content, - :url => {:action => 'update', :id => @page.title}, - :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %> - <%= f.hidden_field :version %> - <% if @section %> - <%= hidden_field_tag 'section', @section %> - <%= hidden_field_tag 'section_hash', @section_hash %> - <% end %> - <%= error_messages_for 'content' %> - -
-

- <%=text_area_tag 'content[text]', @text, :required => true, :id => 'editor02', :cols => 100, :rows => 25 %> -

- -
- -
- <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %> - <%= fields_for @page do |fp| %> -

- - <%= fp.select :parent_id,content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %> -

- <% end %> - <% end %> - -

- - <%= f.text_field :comments, :style => "width:75%;" %> -

-

- - <%= render :partial => 'attachments/form' %> -

-
- -

- <%= submit_tag l(:button_save) %> -

- <%= wikitoolbar_for 'content_text' %> -<% end %> -
-<% content_for :header_tags do %> - <%= robot_exclusion_tag %> -<% end %> -<% html_title @page.pretty_title %> -======= <%= wiki_page_breadcrumb(@page) %> @@ -70,8 +6,8 @@ <%= form_for @content, :as => :content, - :url => {:action => 'update', :id => @page.title}, - :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %> + :url => {:action => 'update', :id => @page.title}, + :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %> <%= f.hidden_field :version %> <% if @section %> <%= hidden_field_tag 'section', @section %> @@ -89,29 +25,29 @@
- <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %> + <% if @page.safe_attribute_names.include?('parent_id') && @wiki.pages.any? %> <%= fields_for @page do |fp| %> -

- - <%= fp.select :parent_id,content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %> -

+

+ + <%= fp.select :parent_id,content_tag('option', '', :value => '') + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent) %> +

<% end %> - <% end %> + <% end %> -

- - <%= f.text_field :comments, :style => "width:75%;" %> -

-

- - <%= render :partial => 'attachments/form' %> -

+

+ + <%= f.text_field :comments, :style => "width:75%;" %> +

+

+ + <%= render :partial => 'attachments/form' %> +

@@ -121,7 +57,6 @@ <% end %>

<% content_for :header_tags do %> - <%= robot_exclusion_tag %> + <%= robot_exclusion_tag %> <% end %> <% html_title @page.pretty_title %> ->>>>>>> d2f4b38eb6fd68a67940b8ffe735d8f7437acde1