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

组织logo上传图片

This commit is contained in:
huang 2016-05-06 19:53:13 +08:00
parent 86b0470b76
commit 23a23fd085
4 changed files with 84 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/layouts/base_org2.html.erb
View File

@ -27,7 +27,7 @@
tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
});
</script>
<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>
<!--<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>-->
<script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
<script src="/javascripts/scrollPic.js"></script><!--滚动-->
@ -179,13 +179,15 @@
</div>
</footer>
<!--页面底部-->
<div class="cl"></div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
<%#= call_hook :view_layouts_base_body_bottom %>
</body>
</html>
<script>
$(".nav-element").mouseover(function(){
$(this).next(".sn-grey-opacity").show();
@ -205,8 +207,7 @@
<script type="text/javascript">
function org_new_files_upload()
{
alert("test");
$('#ajax-modal').html('');
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
showModal('ajax-modal', '513px');
$('#ajax-modal').siblings().remove();
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
@ -224,3 +225,6 @@
$('#ajax-modal').parent().addClass("popbox_polls");
}
</script>
</html>

9
app/views/layouts/base_sub_domain.html.erb
View File

@ -9,7 +9,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'org2','jquery/jquery-ui-1.9.2' %>
<%= stylesheet_link_tag 'org_new_style','jquery/jquery-ui-1.9.2', 'org2' %>
<%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
<%= javascript_include_tag 'attachments' %>
<%#= call_hook :view_layouts_base_html_head %>
@ -27,7 +27,7 @@
tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
});
</script>
<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>
<!--<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>-->
<script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
<script>
@ -173,10 +173,13 @@
</footer>
</div>
<!--页面底部-->
<div class="cl"></div>
<div id="ajax-modal" style="display:none;"></div>
<div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span>
</div>
<%#= call_hook :view_layouts_base_body_bottom %>
</body>
</html>

2
app/views/sub_document_comments/_show_newstyle.html.erb
View File

@ -8,7 +8,7 @@
<div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
<div class="sn-inner-newscon">
<p class=" sn-inner-psmall">来源：<%= @organization.name %> 发布时间:：<%= format_date(@document.created_at) %> 浏览：<%= @organization.visits %>次</p>
<p class=" sn-inner-psmall">来源：<%= @organization.name %> 发布时间：<%= format_date(@document.created_at) %></p>
<p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>
</div>
</div>

68
public/stylesheets/org2.css
View File

@ -1,3 +1,4 @@
@charset "utf-8";
/* CSS Document */
/* 样式重置 */
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
@ -233,3 +234,70 @@ ul.sn-inner-pages li a{border: 1px solid #d1d1d1;padding: 1px 4px 1px 4px;margin
ul.sn-inner-pages li a:hover{ background-color:#24366e; color:#fff; text-decoration:none;}
.sn-inner-pages_select { background-color:#24366e; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
.sn-inner-pages_select a{background-color: #24366e; color: #fff;cursor: default;}
/*弹框*/
.upload_con h2 {
display: block;
background: #eaeaea;
font-size: 14px;
color: #343333;
height: 31px;
width: auto;
margin-top: 25px;
padding-left: 20px;
padding-top: 5px;
}
a.blue_btn {
background: #64bdd9;
color: #fff;
font-size: 14px;
font-weight: normal;
padding: 2px 8px;
text-align: center;
cursor: pointer;
}
a.grey_btn {
background: #d9d9d9;
color: #656565;
font-size: 14px;
font-weight: normal;
text-align: center;
margin-left: 10px;
margin-bottom: 10px;
padding: 2px 10px;
}
span.add_attachment {
font-size: 80%;
line-height: 2.5em;
}
.c_dark {
color: #2d2d2d;
}
.upload_filename {
background: url(../images/pic_file.png) 0 -20px no-repeat;
color: #7f7f7f;
width: 270px;
border: none;
padding-left: 20px;
margin-right: 10px;
margin-bottom: 5px;
white-space: nowrap;
text-overflow: ellipsis;
}
.profiler-results.profiler-left {
left: 0px;
}
.profiler-results {
z-index: 2147483643;
position: fixed;
top: 0px;
}
.filename { background: url(../images/pic_file.png) 0 -25px no-repeat;color: #3ca5c6;max-width: 150px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
.ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
.ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
.upload_filename{ background: url(../images/pic_file.png) 0 -20px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
.evaluation{position: relative;}
.evaluation_submit{position: absolute;right: 0px;bottom: 0px;}
.student_work_search{background-color: #64bdd9;color: white !important;padding: 2px 7px;margin-left: 10px;cursor: pointer; }