<%= image_tag '/images/transparent.png', size: "75x75" %>
-
+
<%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_project) %> , <%= l(:label_welcome_trustie_project_description) %>
-
+
<%= render :partial => "search_project", :locals => {:project_type => 0}%>
@@ -136,3 +149,4 @@
+<%= render partial: 'link_to_another' %>
\ No newline at end of file
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index 6b002746..3e066a51 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -54,7 +54,7 @@ function checkMaxLength() {
<%= link_to l(:label_projects_feedback_respond),'',
{:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
%>
- <% end %>
+ <% end %>
<% if @user == User.current || User.current.admin? || journal.user.id == User.current.id %>
<%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user},
:remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0215d43b..58ce0dd2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1122,6 +1122,8 @@ en:
label_activities_settings: Display settings
#end
+ label_joined_course: Joined Courses
+ label_created_course: Created Courses
#huang
label_file_new: Download
@@ -1611,4 +1613,4 @@ en:
# ajax异步验证
- modal_valid_passing: can be used.
+ modal_valid_passing: can be used.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index c6020d95..4ff4b0c5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -143,7 +143,7 @@ zh:
attachment_all: "全部"
attachment_sufix_browse: "文件类型"
attachment_browse: "内容类型"
- attachment_type: '资源分类'
+ attachment_type: '分类'
general_text_No: '否'
general_text_Yes: '是'
general_text_no: '否'
@@ -1670,7 +1670,9 @@ zh:
label_no_current_participate: 该竞赛暂无参与者
#end
-
+
+ label_joined_course: 参加的课程
+ label_created_course: 创建的课程
label_course: 课程
label_course_new: 新建课程
label_course_join_student: 加入课程
diff --git a/config/routes.rb b/config/routes.rb
index 201de887..f9aa041d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,13 +16,21 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
RedmineApp::Application.routes.draw do
+ resources :homework_users
+
+
resources :no_uses
delete 'no_uses', :to => 'no_uses#delete'
resources :apply_project_masters
delete 'apply_project_masters', :to => 'apply_project_masters#delete'
-
+ resources :homework_attach do
+ collection do
+ match 'addjours', via: [:get, :post]
+ match 'add_jour_reply', via: [:get,:post]
+ end
+ end
resources :open_source_projects do
collection do
match 'search', via: [:get, :post]
@@ -37,6 +45,7 @@ RedmineApp::Application.routes.draw do
end
mount SeemsRateable::Engine => '/rateable', :as => :rateable
+
namespace :zipdown do
match 'assort'
end
@@ -225,6 +234,7 @@ RedmineApp::Application.routes.draw do
match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
################# added by william
match 'users/tag_save', :to => 'users#tag_save', :via => :post, :as => 'tag'
+ match 'users/tag_saveEx', :to => 'users#tag_saveEx', :via => :post
post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
delete 'watchers/watch', :to => 'watchers#unwatch'
@@ -460,9 +470,11 @@ RedmineApp::Application.routes.draw do
get 'attachments/autocomplete'
match 'attachments/autocomplete', :to => 'attachments#autocomplete', via: [:post]
post 'attachments/relationfile', to: 'attachments#add_exist_file_to_project', as: 'attach_relation'
+ get 'attachments/renderTag/:attchmentId', :to => 'attachments#renderTag', :attchmentId => /\d+/
resources :attachments, :only => [:show, :destroy] do
collection do
match "updateType" , via: [:get, :post]
+ match "renderTag" , via: [:get, :post]
end
end
diff --git a/db/migrate/20140519054846_create_homework_users.rb b/db/migrate/20140519054846_create_homework_users.rb
new file mode 100644
index 00000000..46f03343
--- /dev/null
+++ b/db/migrate/20140519054846_create_homework_users.rb
@@ -0,0 +1,10 @@
+class CreateHomeworkUsers < ActiveRecord::Migration
+ def change
+ create_table :homework_users do |t|
+ t.string :homework_attach_id
+ t.string :user_id
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20140519070751_add_name_to_homework_attach.rb b/db/migrate/20140519070751_add_name_to_homework_attach.rb
new file mode 100644
index 00000000..f819b51d
--- /dev/null
+++ b/db/migrate/20140519070751_add_name_to_homework_attach.rb
@@ -0,0 +1,7 @@
+class AddNameToHomeworkAttach < ActiveRecord::Migration
+ def change
+ add_column :homework_attaches, :name, :string
+ add_column :homework_attaches, :description, :string
+ add_column :homework_attaches, :state, :int
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b5cabfa7..4c60942a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140513073801) do
+ActiveRecord::Schema.define(:version => 20140519070751) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@@ -52,14 +52,11 @@ ActiveRecord::Schema.define(:version => 20140513073801) do
add_index "attachments", ["container_id", "container_type"], :name => "index_attachments_on_container_id_and_container_type"
add_index "attachments", ["created_on"], :name => "index_attachments_on_created_on"
- create_table "attachmentstypes", :id => false, :force => true do |t|
- t.integer "id", :null => false
- t.integer "typeId"
+ create_table "attachmentstypes", :force => true do |t|
+ t.integer "typeId", :null => false
t.string "typeName", :limit => 50
end
- add_index "attachmentstypes", ["id"], :name => "id"
-
create_table "auth_sources", :force => true do |t|
t.string "type", :limit => 30, :default => "", :null => false
t.string "name", :limit => 60, :default => "", :null => false
@@ -325,9 +322,12 @@ ActiveRecord::Schema.define(:version => 20140513073801) do
create_table "homework_attaches", :force => true do |t|
t.integer "bid_id"
t.integer "user_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "reward"
+ t.string "name"
+ t.string "description"
+ t.integer "state"
end
create_table "homework_for_courses", :force => true do |t|
@@ -335,6 +335,13 @@ ActiveRecord::Schema.define(:version => 20140513073801) do
t.integer "bid_id"
end
+ create_table "homework_users", :force => true do |t|
+ t.string "homework_attach_id"
+ t.string "user_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "issue_categories", :force => true do |t|
t.integer "project_id", :default => 0, :null => false
t.string "name", :limit => 30, :default => "", :null => false
@@ -756,7 +763,6 @@ ActiveRecord::Schema.define(:version => 20140513073801) do
t.integer "softapplication_id"
t.integer "is_public"
t.string "application_developers"
- t.string "deposit_project_url"
end
create_table "students_for_courses", :force => true do |t|
@@ -865,10 +871,8 @@ ActiveRecord::Schema.define(:version => 20140513073801) do
add_index "user_grades", ["user_id"], :name => "index_user_grades_on_user_id"
create_table "user_levels", :force => true do |t|
- t.integer "user_id"
- t.integer "level"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.integer "user_id"
+ t.integer "level"
end
create_table "user_preferences", :force => true do |t|
diff --git a/public/images/Edit/edit.png b/public/images/edit/edit.png
similarity index 100%
rename from public/images/Edit/edit.png
rename to public/images/edit/edit.png
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 8e4db7fe..81160fa9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -609,6 +609,14 @@ function toggleAndSettingWordsVal(parent_widget, text_widget, value){
text_widget.val(value)
parent_widget.slideToggle(400)
}
+function transpotUrl (scope) {
+ $(scope).each(function(){
+ var tmpContent = $(this).html();
+ tmpContent = tmpContent.replace(/(^|[^\"\'])(http|ftp|mms|rstp|news|https)(\:\/\/[^<\s\+,，]+)/gi,"$1
$2$3<\/a>");
+ // tmpContent = tmpContent.replace(/(^|[^\/])(www\.[^<\s\+,，]+)/gi,"$1 $2 ");
+ $(this).html(tmpContent);
+ });
+}
$(document).ready(setupAjaxIndicator);
$(document).ready(hideOnLoad);
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 3d1520f8..663183b9 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -1,6 +1,17 @@
/* Redmine - project management software
Copyright (C) 2006-2013 Jean-Philippe Lang */
+function postUpMsg(attachmentId)
+{
+ $.ajax({
+ url: '/attachments/renderTag',
+ type: "GET",
+ data: {
+ attachmentId: attachmentId
+ }
+
+ })
+}
function addFile(inputEl, file, eagerUpload) {
if ($('#attachments_fields').children().length < 10) {
@@ -12,14 +23,15 @@ function addFile(inputEl, file, eagerUpload) {
fileSpan.append(
$('
', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name),
$('
', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 255, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
- $('
').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload)
+ $('
').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload),
+ $('
', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} )
).appendTo('#attachments_fields');
-
- if(eagerUpload) {
- ajaxUpload(file, attachmentId, fileSpan, inputEl);
- }
- return attachmentId;
+ if(eagerUpload) {
+ ajaxUpload(file, attachmentId, fileSpan, inputEl);
+
+ }
+ return attachmentId;
}
return null;
}
@@ -66,7 +78,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) {
//gcm files count and add delete_all link
- var count=$('#attachments_fields>span').length;
+ var count=$('#attachments_fields>span').length;
$('#upload_file_count').html("已上传"+""+count+" "+"个文件");
if(count>=1){
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7b0a0099..8e0a81cf 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1319,7 +1319,7 @@ tr.entry td.filename_no_report { width: 70%; }
tr.entry td.size { text-align: right; font-size: 90%; }
tr.entry td.revision, tr.entry td.author { text-align: center; }
tr.entry td.age { text-align: right; }
-tr.entry.file td.filename a { margin-left: 16px; }
+tr.entry.file td.filename a { margin-center: 16px; }
tr.entry.file td.filename_no_report a { margin-left: 16px; }
tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
@@ -1769,6 +1769,14 @@ p.pagination {margin-top:8px; font-size: 90%}
clear:left;
}
+.tabular .tabDiv{
+ margin: 0;
+ padding: 3px 0 3px 0;
+ padding-left: 100px; /* width of left column containing the label elements *//*by young*/
+ /*min-height: 1.8em;*/
+ clear:left;
+}
+
html>body .tabular p {overflow:hidden;}
.tabular label{
@@ -1829,8 +1837,8 @@ fieldset#notified_events .parent { padding-left: 20px; }
span.required {color: #bb0000;}
.summary {font-style: italic;}
-#attachments_fields input.description {margin-left:4px; width:340px; }
-#attachments_fields span {display:block; white-space:nowrap; font-family:'微软雅黑';}
+#attachments_fields input.description {margin-left:4px; width:100px; }
+#attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
#attachments_fields input.filename {border:0; height:1.8em; width:150px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}/*Modified by young*/
#attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
#attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index f7756e5b..5ee72add 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -3,6 +3,20 @@
*/
/************************** 某部分开始 *****************************/
/************************** 某部分结束 *****************************/
+
+/************************** 页脚 footer 开始 *****************************/
+.linkother{
+ width: 460px;
+ margin: 70px auto -35px ;
+}
+.link_other_item{
+ width: 150px;
+ text-align: center;
+ display: inline-block;
+ font-size: 14px;
+}
+/************************** 页脚 footer 结束 *****************************/
+
.top_bar{
height: auto;
}
@@ -312,11 +326,11 @@ a.attachments_list_color {
}
.main-content-bar{
margin: 0;
- margin-top: 35px;
+ margin-top: 12px;
padding: 0;
- margin-bottom: 35px;
- width: 100%;
- height: auto;
+ margin-bottom: 2px;
+ width: 100%;
+ height: 78;
}
.weixin-content{
diff --git a/test/fixtures/homework_users.yml b/test/fixtures/homework_users.yml
new file mode 100644
index 00000000..bec69e59
--- /dev/null
+++ b/test/fixtures/homework_users.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+ homework_attach_id: MyString
+ user_id: MyString
+
+two:
+ homework_attach_id: MyString
+ user_id: MyString