p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
william 2013-08-17 11:15:24 +08:00
parent c610f7c1ce 5115d606ff
commit 711a32e929
16 changed files with 84 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Gemfile
View File

@ -20,14 +20,7 @@ group :openid do
end
# Optional gem for exporting the gantt to a PNG file, not supported with jruby
platforms :mri, :mingw do
group :rmagick do
# RMagick 2 supports ruby 1.9
# RMagick 1 would be fine for ruby 1.8 but Bundler does not support
# different requirements for the same gem on different platforms
gem "rmagick", ">= 2.0.0"
end
end
platforms :jruby do
# jruby-openssl is bundled with JRuby 1.7.0
@ -74,14 +67,9 @@ end
group :development do
gem "rdoc", ">= 2.4.2"
gem "yard"
end
group :test do
gem "shoulda", "~> 3.3.2"
gem "mocha", "~> 0.12.3"
gem 'capybara', '~> 2.0.0'
end
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
if File.exists?(local_gemfile)

48
Gemfile.lock
View File

@ -32,19 +32,9 @@ GEM
rails (>= 3, < 5)
arel (3.0.2)
builder (3.0.0)
capybara (2.0.3)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
coderay (1.0.9)
erubis (2.7.0)
fastercsv (1.5.5)
ffi (1.9.0-x86-mingw32)
fastercsv (1.5.0)
hike (1.2.3)
i18n (0.6.1)
journey (1.0.4)
@ -55,17 +45,10 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.23)
mini_portile (0.5.0)
mocha (0.12.10)
metaclass (~> 0.0.1)
multi_json (1.7.6)
mysql2 (0.3.11-x86-mingw32)
net-ldap (0.3.1)
nokogiri (1.6.0-x86-mingw32)
mini_portile (~> 0.5.0)
pg (0.14.1-x86-mingw32)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
@ -95,38 +78,18 @@ GEM
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
rmagick (2.13.2)
ruby-openid (2.1.8)
rubyzip (0.9.9)
jquery-rails
rails
selenium-webdriver (2.33.0)
childprocess (>= 0.2.5)
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
shoulda (3.3.2)
shoulda-context (~> 1.0.1)
shoulda-matchers (~> 1.4.1)
shoulda-context (1.0.2)
shoulda-matchers (1.4.1)
activesupport (>= 3.0.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7-x86-mingw32)
thor (0.18.1)
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
websocket (1.0.7)
xpath (1.0.0)
nokogiri (~> 1.3)
yard (0.8.6.1)
PLATFORMS
x86-mingw32
@ -134,24 +97,15 @@ PLATFORMS
DEPENDENCIES
activerecord-jdbc-adapter (= 1.2.5)
activerecord-jdbcmysql-adapter
activerecord-jdbcpostgresql-adapter
activerecord-jdbcsqlite3-adapter
acts-as-taggable-on
builder (= 3.0.0)
capybara (~> 2.0.0)
coderay (~> 1.0.6)
fastercsv (~> 1.5.0)
i18n (~> 0.6.0)
jquery-rails (~> 2.0.2)
mocha (~> 0.12.3)
mysql2 (~> 0.3.11)
net-ldap (~> 0.3.1)
pg (>= 0.11.0)
rack-openid
rails (= 3.2.13)
rdoc (>= 2.4.2)
rmagick (>= 2.0.0)
ruby-openid (~> 2.1.4)
shoulda (~> 3.3.2)
sqlite3
yard

0
app/controllers/shell/shell Normal file
View File

16
app/helpers/application_helper.rb
View File

@ -1300,6 +1300,14 @@ module ApplicationHelper
#added by nie
# Display watcher picture
def show_more_watchers?(obj)
if User.watched_by(obj.id).count > 12
return true
else
return false
end
end
def show_watcher_profile(obj)
count = 0
html = ''
@ -1314,6 +1322,14 @@ module ApplicationHelper
end
#display fans picture
def show_more_fans?(obj)
if obj.watcher_users.count > 12
return true
else
return false
end
end
def show_fans_picture(obj)
html = ''
count = 0

2
app/views/account/register.html.erb
View File

@ -16,6 +16,8 @@
<p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p>
<p><%= f.text_field :mail, :required => true %></p>
<p>
<em class="info"><%="#{l(:label_mail_attention)} "%></em></p>
<p><%= f.select :language, lang_options_for_select %></p>
<% if Setting.openid? %>

3
app/views/issues/_form.html.erb
View File

@ -19,6 +19,9 @@
<% if @issue.safe_attribute? 'subject' %>
<p><%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true, :style => "font-size:small" %></p>
<!--Added by young-->
<%= javascript_tag "observeAutocompleteField('issue_subject', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil))}')" %>
<!--Ended by young-->
<% end %>
<% if @issue.safe_attribute? 'description' %>

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

@ -82,7 +82,7 @@
<tr>
<td style="padding-top: 5px">
<% for user in @bid.watcher_users%>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %>
<% end%>
</td>
</tr>
@ -100,7 +100,7 @@
<tr>
<td style="padding-top: 5px">
<% for project in @bid.projects%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar"), project_path(project), :class => "avatar" %>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
<% end%></td>
</tr>
</table>

3
app/views/layouts/base_projects.html.erb
View File

@ -117,10 +117,11 @@
<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:project_module_boards) ,project_boards_path(@project) %>
</td>
<% if @project.identifier = 'trustie' %>
<% if @project.identifier == 'trustie' %>
<td align="left" width="190px" valign="left"><%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %>
<%= link_to l(:label_user_response) ,project_feedback_path(@project) %>
</td>
<% else %>
<% end %>
</tr>
</table>

8
app/views/layouts/base_users.html.erb
View File

@ -69,7 +69,7 @@
</table>
</div>
<!--Modified by nie-->
<!--tags-->
<div class="user_underline"></div>
<!-- <div class="user_fans"> -->
@ -86,6 +86,9 @@
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_user_watcher) %></strong>
<% if show_more_watchers?(@user) %>
<div style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" ><%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%></div>
<% end %>
</div>
<div class="left_wf">
@ -101,6 +104,9 @@
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_user_fans) %></strong>
<% if show_more_fans?(@user) %>
<div style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" ><%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%></div>
<% end %>
</div>
<div class="left_wf">
<table>

6
app/views/projects/feedback.html.erb
View File

@ -9,11 +9,7 @@
<td><table width="580px" border="0">
<tr>
<td colspan="2" valign="top"><strong> <%=link_to journal.user, user_path(journal.user)%></strong>
<% if @user == User.current%>
<span class="font_lighter"><%= l(:label_leave_me_message) %></span>
<% else %>
<span class="font_lighter"><%= l(:label_leave_others_message) %></span>
<% end %>
<span class="font_lighter">对项目进行了反馈</span>
</td>
</tr>
<tr>

2
app/views/repositories/show.html.erb
View File

@ -76,7 +76,7 @@
<% end %>
<% end %>
如何提交代码&nbsp;<%= link_to('中文', ch_usage_path)%>&nbsp;<%= link_to('English', en_usage_path)%>
<%= l(:label_how_commit_code) %>&nbsp;<%= link_to(l(:label_how_commit_code_chinese), ch_usage_path)%>&nbsp;<%= link_to('English', en_usage_path)%>

1
app/views/users/index.html.erb
View File

@ -33,6 +33,7 @@
<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>

6
app/views/welcome/index.html.erb
View File

@ -137,7 +137,7 @@ software development and software crowdsourcing.</td></tr>
<!--add by huang-->
<!--add by huang-->
<div style="height:230px;">
<div style="height:250px;">
<div class="welcone_left">
<table width="350px">
<tr>
@ -243,7 +243,7 @@ software development and software crowdsourcing.</td></tr>
<div>
<table width="700" border="0" align="center" style="padding-top: 100px">
<tr><td colspan="5" align="center" style="padding-bottom: 10px; font-size: 18px; font-color: #5c5c5c ; font-family: 微软雅黑">朋友，系统仍在不断完善，有意见和建议请 <strong><%= toggle_link '点击我', 'put-bid-form', {:focus => 'new_form_project_message'} %></strong></td></tr>
<tr><td colspan="5" align="center" style="padding-bottom: 10px; font-size: 18px; font-color: #5c5c5c ; font-family: 微软雅黑"><%= l(:label_welcome_leave_message) %> <strong><%= toggle_link l(:label_welcome_click_me), 'put-bid-form', {:focus => 'new_form_project_message'} %></strong></td></tr>
<tr><td colspan="5" align="center" ><div class="homepage_underline"></div></td></tr>
<tr><td colspan="5" align="center">
<div id="put-bid-form" style="display: none">
@ -253,7 +253,7 @@ software development and software crowdsourcing.</td></tr>
<table border="0" width="525px" align="center" >
<tr>
<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "#{l(:label_leave_a_message)}", :onfocus => "clearInfo('new_form_project_message','#{l(:label_leave_a_message)}')", :onblur => "showInfo('new_form_project_message','#{l(:label_leave_a_message)}')", :style => "resize: none;", :class => 'noline'%></td>
<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "我要反馈", :onfocus => "clearInfo('new_form_project_message','我要反馈')", :onblur => "showInfo('new_form_project_message','我要反馈')", :style => "resize: none;", :class => 'noline'%></td>
</tr>
</table>
<table border="0" width="525px" align="center">

53
config/database.yml
View File

@ -1,20 +1,23 @@
# Default setup is given for MySQL with ruby1.8. If you're running Redmine
# with MySQL and ruby1.9, replace the adapter name with `mysql2`.
# Examples for PostgreSQL and SQLite3 can be found at the end.
# Default setup is given for MySQL with ruby1.9. If you're running Redmine
# with MySQL and ruby1.8, replace the adapter name with `mysql`.
# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
# Line indentation must be 2 spaces (no tabs).
production:
adapter: mysql2
database: bitnami_redmine
host: 10.0.47.245
host: 192
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
port: 3306
username: root
password: "bitnami"
password: "1234"
encoding: utf8
development:
adapter: mysql2
database: bitnami_redmine
host: 10.0.47.245
#socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
port: 3306
username: root
password: "bitnami"
@ -26,20 +29,34 @@ development:
test:
adapter: mysql2
database: bitnami_redmine
host: 10.0.47.121
port: 3306
username: root
password: "7a9dca93e6"
encoding: utf8
test_pgsql:
adapter: postgresql
database: bitnami_redmine
host: 10.0.47.121
host: 192.168.83.251
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
port: 3306
username: root
password: "1234"
encoding: utf8
test_sqlite3:
adapter: sqlite3
database: bitnami_redmine
# PostgreSQL configuration example
#production:
# adapter: mysql2
# database: bitnami_redmine
# host: localhost
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
port: 3306
# username: bitnami
# password: "c16af1e560"
# SQLite3 configuration example
#production:
# adapter: mysql2
# database: bitnami_redmine
# SQL Server configuration example
#production:
# adapter: mysql2
# database: bitnami_redmine
# host: localhost
socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
port: 3306
# username: bitnami
# password: "c16af1e560"

4
config/locales/en.yml
View File

@ -1247,3 +1247,7 @@ en:
label_all_revisions: All revisions：
label_repository_name: Repository name
label_upassword_info: The password can be shared in the group
label_how_commit_code: How to commit code：
label_how_commit_code_chinese: Chinese
label_welcome_leave_message: Friend,the system continues to improve,with the suggestion please
label_welcome_click_me: Click me

4
config/locales/zh.yml
View File

@ -1259,3 +1259,7 @@ zh:
label_max_number: 至多25个字符。
label_all_revisions: 所有版本：
label_upassword_info: 该密码在项目组内可共享
label_how_commit_code: 如何提交代码：
label_how_commit_code_chinese: 中文
label_welcome_leave_message: 朋友，系统仍在不断完善，有意见和建议请
label_welcome_click_me: 点击我