jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

组织样式更改

This commit is contained in:
Tim 2015-11-20 14:30:54 +08:00
parent 4d4b163f17
commit e3d78bf4f0
7 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/organizations/new.html.erb
View File

@ -34,8 +34,8 @@
<span class="c_grey">（打钩为公开，不打钩则不公开，若不公开，仅组织成员可见该组织。）</span>
<div class="cl"></div>
</li>
<li class=" ml90" >
<a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_organization();" >提交</a>
<li class=" ml125" >
<a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_organization();" >创建</a>
<%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
<div class="cl"></div>
</li>

2
app/views/users/user_organizations.html.erb
View File

@ -2,7 +2,7 @@
<%#= stylesheet_link_tag 'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
<div class="homepageContentContainer">
<div class="homepageContent">
<div class="postContainer">
<div class="postContainer mb10">
<div class="postBanner" style="padding-bottom:5px;">
<span class="linkGrey2 f16">组织列表</span>

5
db/migrate/20151116070906_add_created_at_to_org_members.rb
View File

@ -1,5 +0,0 @@
class AddCreatedAtToOrgMembers < ActiveRecord::Migration
def change
add_column :org_members, :created_at, :timestamp
end
end

44
db/schema.rb
View File

@ -529,23 +529,26 @@ ActiveRecord::Schema.define(:version => 20151118031602) do
add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
add_index "documents", ["project_id"], :name => "documents_project_id"
create_table "dts", :force => true do |t|
t.string "IPLineCode"
t.string "Description"
t.string "Num"
t.string "Variable"
t.string "TraceInfo"
t.string "Method"
create_table "dts", :primary_key => "Num", :force => true do |t|
t.string "Defect", :limit => 50
t.string "Category", :limit => 50
t.string "File"
t.string "IPLine"
t.string "Review"
t.string "Category"
t.string "Defect"
t.string "PreConditions"
t.string "StartLine"
t.string "Method"
t.string "Module", :limit => 20
t.string "Variable", :limit => 50
t.integer "StartLine"
t.integer "IPLine"
t.string "IPLineCode", :limit => 200
t.string "Judge", :limit => 15
t.integer "Review", :limit => 1
t.string "Description"
t.text "PreConditions", :limit => 2147483647
t.text "TraceInfo", :limit => 2147483647
t.text "Code", :limit => 2147483647
t.integer "project_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "id", :null => false
end
create_table "enabled_modules", :force => true do |t|
@ -815,16 +818,6 @@ ActiveRecord::Schema.define(:version => 20151118031602) do
add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
create_table "journal_details_copy", :force => true do |t|
t.integer "journal_id", :default => 0, :null => false
t.string "property", :limit => 30, :default => "", :null => false
t.string "prop_key", :limit => 30, :default => "", :null => false
t.text "old_value"
t.text "value"
end
add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
create_table "journal_replies", :id => false, :force => true do |t|
t.integer "journal_id"
t.integer "user_id"
@ -1084,6 +1077,7 @@ ActiveRecord::Schema.define(:version => 20151118031602) do
create_table "org_members", :force => true do |t|
t.integer "user_id"
t.integer "organization_id"
t.string "role"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end

1
public/stylesheets/new_user.css
View File

@ -84,6 +84,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
.ml90{ margin-left:90px;}
.ml100{ margin-left:100px;}
.ml110{ margin-left:110px;}
.ml125 { margin-left:125px;}
.ml150 { margin-left:150px;}
.mr-5 {margin-right:-5px;}
.mr5{ margin-right:5px;}

2
public/stylesheets/org.css
View File

@ -2,7 +2,7 @@
/* CSS Document */
.orgName {width:130px; color:#484848;}
.organization_r_h02{ width:970px; height:40px; background:#eaeaea; margin-bottom:10px;}
.organization_r_h02{ width:980px; height:40px; background:#eaeaea; margin-bottom:10px;}
.organization_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
.orgSettingOp {width:45px; height:21px; color:#269ac9; text-align:center; border-bottom:3px solid #e4e4e4; float:left; font-weight:bold; cursor:pointer;}

1
public/stylesheets/public.css
View File

@ -77,6 +77,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.ml90{ margin-left:90px;}
.ml100{ margin-left:100px;}
.ml110{ margin-left:110px;}
.ml125 { margin-left:125px;}
.ml320{ margin-left:320px;}
.ml150 { margin-left:150px;}
.mr-5 {margin-right:-5px;}