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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2015-04-23 17:32:56 +08:00
parent 10bc470dcf e38639665b
commit b6652ed5e5
9 changed files with 76 additions and 74 deletions

1
app/views/avatar/_avatar_form.html.erb
View File

@ -68,7 +68,6 @@
:source_id => source.id.to_s
} %>
</span>
<span class="c_orange ml25 f12">(个人头像建议90*90大小，或者等比图像)</span>
</div>
<% content_for :header_tags do %>

3
app/views/avatar/_new_avatar_form.html.erb
View File

@ -5,7 +5,7 @@
<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
<%= file_field_tag 'avatar[image]',
:id => nil,
:class => 'upload_avatar ',
:class => 'upload_file',
:size => "1",
:multiple => false,
:onchange => 'addInputAvatar(this);',
@ -21,7 +21,6 @@
:source_id => source.id.to_s
} %>
<!--</span>-->
<span class="c_orange ml25 mt43 f12 fl ">(课程和项目logo建议60*60大小，或者等比图像)</span>
<% content_for :header_tags do %>
<%= javascript_include_tag 'avatars' %>
<% end %>

13
app/views/issues/index.html.erb
View File

@ -16,6 +16,13 @@
});
}
function EnterPress(e){
var e = e || window.event;
if(e.keyCode == 13){
remote_function();
}
}
</script>
@ -24,10 +31,10 @@
</div>
<div class="problem_top">
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
<%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
<%= hidden_field_tag 'set_filter', '1' %>
<div class="problem_search" >
<input class="problem_search_input fl" id="v_subject" type="text" name="v[subject]" value="">
<input class="problem_search_input fl" id="v_subject" type="text" name="v[subject]" value="" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
<a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
</div><!--problem_search end-->
@ -58,7 +65,7 @@
%>
</div><!--filter_form end-->
<div class="cl"></div>
<% end %>
<%# end %>
<p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.count %></a>
<%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').count %> </a>
</p>

62
app/views/layouts/_base_feedback.html.erb
View File

@ -1,11 +1,4 @@
<style type="text/css">
#scrollsidebar{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#F6F7F8; font-style:normal;}
#scrollsidebar div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ }
#scrollsidebar div,img,tr,td,table{ border:0;}
#scrollsidebar ol,ul,li{ list-style-type:none}
#scrollsidebar .cl{ clear:both; overflow:hidden; }
#scrollsidebar a{ text-decoration:none;}
html{ overflow-x:hidden;}
.scrollsidebar{ position:fixed;bottom:1px; right:1px; background:none; }
.side_content{width:154px; height:auto; overflow:hidden; float:left; }
@ -36,28 +29,9 @@
.msgserver a {color:#15bccf; }
.msgserver a:hover { text-decoration:underline; }
</style>
<script>
/* =================================================
//
// jQuery Fixed Plugins 1.3.1
// author :
// Url:
// Data : 2012-03-30
//
// ???? : float --> ????[left or right]
// minStatue --> ??С???????show_btn
// skin --> ???????
// durationTime --> ??????
//???? :
$("#scrollsidebar2").fix({
float : 'right', //default.left or right
minStatue : true, //default.false or true
skin : 'green', //default.gray or yellow ??blue ??green ??orange ??white
durationTime : 1000 //
});
//
// =================================================*/
<head>
<script>
(function($){
$.fn.fix = function(options){
var defaults = {
@ -152,15 +126,18 @@ function cookieget(n)
return false;
}
</script>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><%= l(:label_feedback) %></title>
</head>
<body style="height:auto" >
<!-- ?ú?? ???? -->
<body>
<script type="text/javascript">
$(function() {
$("#scrollsidebar").fix({
float : 'right', //default.left or right
minStatue : cookieget('minStatue'),
skin : 'green', //default.gray or blue
durationTime : 600
});
});
</script>
<div class="scrollsidebar" id="scrollsidebar" style="float: right">
<div class="side_content">
<div class="side_list">
@ -184,17 +161,4 @@ function cookieget(n)
</div>
<div class="show_btn"><span><%= l(:label_submit)%></span></div>
</div>
<!-- ?ú?? ?á?? -->
<script type="text/javascript">
$(function() {
$("#scrollsidebar").fix({
float : 'right', //default.left or right
minStatue : cookieget('minStatue'),
skin : 'green', //default.gray or blue
durationTime : 600
});
});
</script>
</body>
</html>

3
app/views/wiki/_content.html.erb
View File

@ -1,5 +1,6 @@
<%= textAreailizable content, :text, :attachments => content.page.attachments,
:edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
:edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title, :class =>"break_word_firefox"})
%>
<%#= content.text.html_safe %>

2
config/locales/commons/zh.yml
View File

@ -354,7 +354,7 @@ zh:
label_feedback_tips: "有什么想说的，尽管来咆哮吧~~"
label_technical_support: "技术支持："
label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
label_feedback_value: "用户意见反馈"
label_feedback_value: "用户反馈"

61
public/javascripts/feedback.js
View File

@ -5,17 +5,18 @@
minStatue : true,
skin : 'blue',
durationTime : 1000
};
}
var options = $.extend(defaults, options);
this.each(function(){
//???????
var thisBox = $(this),
closeBtn = thisBox.find('.close_btn' ),
show_btn = thisBox.find('.show_btn' ),
sideContent = thisBox.find('.side_content'),
sideList = thisBox.find('.side_list')
;
var defaultTop = thisBox.offset().top;
var defaultTop = thisBox.offset().top; //????????top
thisBox.css(options.float, 0);
if(options.minStatue == "true"){
@ -24,34 +25,59 @@
show_btn.css('width', 25);
}
//close
closeBtn.bind("click",function(){
sideContent.animate({width: '0px'},"fast");
show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
cookiesave('minStatue','false','','','');
cookiesave('minStatue','true','','','');
});
//show
show_btn.bind("click",function() {
$(this).animate({width: '0px'},"fast");
sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
cookiesave('minStatue','true','','','');
cookiesave('minStatue','false','','','');
});
});
}); //end this.each
};
})(jQuery);
$(function(){
$("#button1").click(function(){
myTips("<%= l(:label_feedback_success) %>","success");
});
});
function f_submit()
{
var subject = $("#memo_subject").val();
var content = $("#memo_content_1").val();
$("#memo_subject").val(subject+"："+ content.substr(0,18));
$("#new_memo").submit();
}
function cookiesave(n, v, mins, dn, path)
{
if(n)
{
if(!mins) mins = 365 * 24 * 60;
if(!path) path = "/";
var date = new Date();
date.setTime(date.getTime() + (mins * 60 * 1000));
var expires = "; expires=" + date.toGMTString();
if(dn) dn = "domain=" + dn + "; ";
document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
}
}
function cookieget(n)
{
var name = n + "=";
@ -61,18 +87,11 @@ function cookieget(n)
while (c.charAt(0)==' ') c = c.substring(1,c.length);
if (c.indexOf(name) == 0){
return c.substring(name.length,c.length);}
}
return false;
}
$(function() {
$("#scrollsidebar").fix({
float : 'right', //default.left or right
minStatue : cookieget('minStatue'),
skin : 'green', //default.gray or blue
durationTime : 600
});
});
$(function(){
$("#button1").click(function(){
@ -86,4 +105,16 @@ function f_submit()
var content = $("#memo_content").val();
$("#memo_subject").val(subject+"："+ content.substr(0,18));
$("#new_memo").submit();
}
}
$(document).ready(function () {
$(function () {
$("#scrollsidebar").fix({
float: 'right', //default.left or right
minStatue: cookieget('minStatue'),
skin: 'green', //default.gray or blue
durationTime: 600
});
});
});

2
public/stylesheets/courses.css
View File

@ -331,7 +331,7 @@ a:hover.st_add{ color:#ff8e15;}
.upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;}
.upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;cursor: pointer;}
.upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
.upload_avatar{margin-left: -350px;margin-top: 40px;width: 60px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
/* 功能倒计时*/
.w_img{ float:left; margin:10px 10px 15px 0px;}
.w_p{ float:left; color:#15bccf; font-size:16px; font-weight:bold; margin-top:70px; }

3
public/stylesheets/project.css
View File

@ -371,7 +371,7 @@ blockquote {
}
/*上传项目图片*/
.upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
.upload_avatar{margin-left: -350px;margin-top: 40px;width: 60px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
/*配置*/
.pro_st_ttl{ height:24px;}
.pro_st_ctt{height:auto; clear:both;}
@ -475,6 +475,7 @@ img.ui-datepicker-trigger {
.wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;}
.wiki_con_box{ line-height:1.9; color:#2d2d2d;}
.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
.wiki_page p{word-break: break-all;word-wrap: break-word;}
#wiki_new_box{ display:none;}
/*wiki显示附加*/
.wiki-page {font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;}