<%= 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/config/routes.rb b/config/routes.rb
index 58e1475c2..14a750743 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,14 +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
- match 'homework_attach/addjours', :controller => 'homework_attach', :action => 'addjours', :via => [:get,:post]
+ 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]
diff --git a/db/migrate/20140519054846_create_homework_users.rb b/db/migrate/20140519054846_create_homework_users.rb
new file mode 100644
index 000000000..46f033436
--- /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 000000000..f819b51d2
--- /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 74310a946..4c60942a3 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 => 20140509020307) 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 => 20140509020307) 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 => 20140509020307) 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 => 20140509020307) 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
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1a1c1b2ea..8e0a81cf6 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -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{
@@ -1830,7 +1838,7 @@ span.required {color: #bb0000;}
.summary {font-style: italic;}
#attachments_fields input.description {margin-left:4px; width:100px; }
-#attachments_fields span {display:block; white-space:nowrap; font-family:'微软雅黑';}
+#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 f7756e5b8..5ee72add5 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 000000000..bec69e598
--- /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