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

Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

This commit is contained in:
cxt 2016-05-25 15:27:00 +08:00
parent fc3b47e3aa 1c0a68e57b
commit 5c9ec49457
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/_project_info.html.erb
View File

@ -20,9 +20,9 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div > <div >
<a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a> <a class="pr_info_name fl c_dark fb" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
<div> <div>
<a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"> <a class="pr_info_name c_dark fb fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
<%= @course.name %> <%= @course.name %>
</a> </a>
<span id="course_outline_bar"> <span id="course_outline_bar">

2
app/views/organizations/_org_member_list.html.erb
View File

@ -1,6 +1,6 @@
<% members.each do |member|%> <% members.each do |member|%>
<ul class="orgListRow"> <ul class="orgListRow">
<li class="orgListUser"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %></a></li> <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %></a></li>
<li class="orgListRole"> <li class="orgListRole">
<%= get_org_member_role_name member %> <%= get_org_member_role_name member %>
<%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s, <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,

4
public/stylesheets/org.css
View File

@ -18,14 +18,14 @@
.orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;} .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;} a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;}
a.saveBtn:hover {background-color:#297fb8;} a.saveBtn:hover {background-color:#297fb8;}
.orgMemberList {width:480px; float:left;} .orgMemberList {width:420px; float:left;}
.orgColumnList {width:688px; float:left;} .orgColumnList {width:688px; float:left;}
.orgListUser {width:110px; float:left;padding-right: 10px;} .orgListUser {width:110px; float:left;padding-right: 10px;}
.orgListRole {width:180px; float:left;} .orgListRole {width:180px; float:left;}
.orgOrder {width:70px; float:left; text-align:center;} .orgOrder {width:70px; float:left; text-align:center;}
.orgSubNum {width:30px; float:left; text-align:center;} .orgSubNum {width:30px; float:left; text-align:center;}
.subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;} .subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3; width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;}
.orgMemContainer {width:208px;} .orgMemContainer {width:268px;}
.orgMemberAdd {float:right;} .orgMemberAdd {float:right;}
.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;} .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
.undis {display:none;} .undis {display:none;}