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

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-12-18 14:38:10 +08:00
parent 70f93741d6 b3b5bc7ffd
commit eb02a3d34a
9 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/files/_upload_subfield_file.html.erb
View File

@ -9,7 +9,7 @@
<%= form_tag(org_subfield_files_path(org_subfield, :in_org => params[:in_org]), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
<% if params[:in_org] %>
<div class="c_dark">
<input name="org_subfield_attachment_type[]" type="checkbox" value="2" class="c_dblue">软件</input>&nbsp;<span class="c_grey">|</span>&nbsp;
<input name="org_subfield_attachment_type[]" type="checkbox" value="2" checked class="c_dblue">软件</input>&nbsp;<span class="c_grey">|</span>&nbsp;
<input name="org_subfield_attachment_type[]" type="checkbox" value="3" class="c_dblue">媒体</input>&nbsp;<span class="c_grey">|</span>&nbsp;
<input name="org_subfield_attachment_type[]" type="checkbox" value="4" class="c_dblue">代码</input>&nbsp;<span class="c_grey">|</span>&nbsp;
<input name="org_subfield_attachment_type[]" type="checkbox" value="5" class="c_dblue">其他</input></a>

2
app/views/org_document_comments/edit.html.erb
View File

@ -15,7 +15,7 @@
}
}
</script>
<div class="homepageRightBanner mb5">
<div class="homepageRightBanner mb5" style="margin-bottom:5px;">
<div class="NewsBannerName">编辑文章</div>
</div>
<div class="cl"></div>

8
app/views/organizations/_join_course_menu.html.erb
View File

@ -87,10 +87,10 @@
url: "/organizations/"+orgId + "/join_courses?" + $("#join_courses_form").serialize(),
type: "post",
success: function (data) {
$.ajax({
url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(),
type: "get"
});
// $.ajax({
// url: "/organizations/" + orgId + "/search_courses?name=" + $("input[name='courses']").val().trim(),
// type: "get"
// });
}
});
}

8
app/views/organizations/_join_project_menu.html.erb
View File

@ -83,10 +83,10 @@
url: "/organizations/"+orgId + "/join_projects?" + $("#join_projects_form").serialize(),
type: "post",
success: function (data) {
$.ajax({
url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(),
type: "get"
});
// $.ajax({
// url: "/organizations/" + orgId + "/search_projects?name=" + $("input[name='projects']").val().trim(),
// type: "get"
// });
}
});
}

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

@ -1,5 +1,5 @@
<%= stylesheet_link_tag 'courses' %>
<div class="resources mt10">
<div class="resources">
<div class="project_r_h" style="width: 720px;">
<h2 class="project_h2"> 组织成员</h2>
</div>

2
app/views/organizations/join_course_menu.js.erb
View File

@ -4,7 +4,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_course_men
showModal('ajax-modal', '320px');
$('#ajax-modal').siblings().hide();
$('#ajax-modal').before(
"<a href='javascript:' onclick='hideModal();location.reload();' class='resourceClose' style='margin-left: 300px;'></a>");
"<a href='javascript:' onclick='hideModal();' class='resourceClose' style='margin-left: 300px;'></a>");
//$('#ajax-modal').css('position','absolute')
$('#ajax-modal').css("top","").css("left","");
$('#ajax-modal').parent().addClass("resourceSharePopup");

11
app/views/organizations/join_courses.js.erb
View File

@ -1,6 +1,7 @@
$("#homepageLeftMenuCourses").html("");
$("#homepageLeftMenuCourses").append("<ul>");
$("#homepageLeftMenuCourses").append("<%= escape_javascript(render :partial => 'layouts/org_courses',
//$("#homepageLeftMenuCourses").html("");
//$("#homepageLeftMenuCourses").append("<ul>");
//$("#homepageLeftMenuCourses").append("<%#= escape_javascript(render :partial => 'layouts/org_courses',
:locals=>{:courses=>@organization.courses.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>");
$("#homepageLeftMenuCourses").append("</ul>");
$("#homepageLeftMenuCourses").show();
//$("#homepageLeftMenuCourses").append("</ul>");
//$("#homepageLeftMenuCourses").show();
location.reload();

2
app/views/organizations/join_project_menu.js.erb
View File

@ -4,7 +4,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_project_me
showModal('ajax-modal', '320px');
$('#ajax-modal').siblings().hide();
$('#ajax-modal').before(
"<a href='javascript:' onclick='hideModal();location.reload();' class='resourceClose' style='margin-left: 300px;'></a>");
"<a href='javascript:' onclick='hideModal();' class='resourceClose' style='margin-left: 300px;'></a>");
//$('#ajax-modal').css('position','absolute');
$('#ajax-modal').css("top","").css("left","");
$('#ajax-modal').parent().addClass("resourceSharePopup");

11
app/views/organizations/join_projects.js.erb
View File

@ -1,6 +1,7 @@
$("#homepageLeftMenuProjects").html("");
$("#homepageLeftMenuProjects").append("<ul>");
$("#homepageLeftMenuProjects").append("<%= escape_javascript(render :partial => 'layouts/org_projects',
//$("#homepageLeftMenuProjects").html("");
//$("#homepageLeftMenuProjects").append("<ul>");
//$("#homepageLeftMenuProjects").append("<%#= escape_javascript(render :partial => 'layouts/org_projects',
:locals=>{:projects=>@organization.projects.reorder('created_at').uniq.limit(5),:org_id=>@organization.id,:page=> 1}) %>");
$("#homepageLeftMenuProjects").append("</ul>");
$("#homepageLeftMenuProjects").show();
//$("#homepageLeftMenuProjects").append("</ul>");
//$("#homepageLeftMenuProjects").show();
location.reload();