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

fix little words

This commit is contained in:
yanxd 2013-11-08 17:20:26 +08:00
parent f13665959a
commit 56cbca3ce8
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -29,7 +29,7 @@ module ApplicationHelper
## added by william ## added by william
include PraiseTreadHelper include PraiseTreadHelper
# add by nyan # add by nyan
include CoursesHelper # include CoursesHelper
extend Forwardable extend Forwardable
def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter

9
app/views/files/index.html.erb
View File

@ -1,18 +1,17 @@
<h3><!-- %=l(:label_attachment_plural)%></h3 -->
<div class="contextual" style="float:left;padding-top: 5px;">
<% if @project.project_type == 1 %> <% if @project.project_type == 1 %>
<div class="contextual" style="padding-right: 540px;padding-top: 5px;">
<% if User.current.member_of?(@project) %> <% if User.current.member_of?(@project) %>
<!-- %= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) % --> <!-- %= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) % -->
<%= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.member_of?(@project) %> <%= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.member_of?(@project) %>
<% end %> <% end %>
</div> </div>
<% else %> <% else %>
<div class="contextual" style="padding-right: 540px;padding-top: 5px;">
<%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %> <%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
<!-- %= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.member_of?(@project) % --> <!-- %= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.member_of?(@project) % -->
</div>
<% end %> <% end %>
</div>
<h3><%=l(:label_attachment_plural)%></h3>
<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %> <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>

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

@ -1,6 +1,7 @@
<!--add by huang--> <!--add by huang-->
<h3 style="padding-top:0px;"><%= l(:field_issue) %> <h3 style="padding-top:0px;"><!--%= l(:field_issue) %-->
<div style="padding-bottom: 10px;padding-right:440px;float:right;font-size:11px;"> <!-- div style="padding-bottom: 10px;padding-right:440px;float:right;font-size:11px;" -->
<div style="padding-bottom: 10px;font-size:11px;">
<%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new, <%= link_to l(:label_issue_new), { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
:html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %> :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }, :class => 'icon icon-add' %>
</div> </div>

2
app/views/layouts/base_homework.html.erb
View File

@ -4,6 +4,8 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="description" content="<%= Redmine::Info.app_name %>" /> <meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<title><%=h l(:label_active_homework) << " - Trustie" %></title>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>

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

@ -1,7 +1,7 @@
<p> <p>
<% if @events_by_day.size >0 %> <% if @events_by_day.size >0 %>
<div style="padding-left: 8px"> <div style="padding-left: 8px">
<h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> <h3><!-- %= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe % --></h3>
<p class="subtitle"> <p class="subtitle">
<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
</p> </p>

2
app/views/versions/index.html.erb
View File

@ -3,7 +3,7 @@
<%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %> <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
</div> </div>
<h3 style="padding-top:0px;padding-bottom: 0px;"><%=l(:label_roadmap)%></h3> <h3 style="padding-top:0px;padding-bottom: 0px;"><!-- %=l(:label_roadmap)% --></h3>
<!--check boxes--> <!--check boxes-->
<fieldset id="filters" class="collapsible collapsed" style="background-color: #FFF"> <fieldset id="filters" class="collapsible collapsed" style="background-color: #FFF">
<legend><%= l(:label_version_display_settings)%></legend> <legend><%= l(:label_version_display_settings)%></legend>