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

Merge branch 'dev_newproject' into develop

This commit is contained in:
huang 2016-10-28 09:44:27 +08:00
parent 03b8d081ce fbfe0038ee
commit cc93c830dd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/projects/settings/_new_versions.html.erb
View File

@ -21,8 +21,8 @@
<tbody> <tbody>
<% @project.shared_versions.each do |version| %> <% @project.shared_versions.each do |version| %>
<tr> <tr>
<th class="fl hidden" style="width:156px;"> <th class="fl hidden" style="width:156px;" title="<%= version.name %>" >
<%= link_to version.name, project_versions_path(version), :class => "c_blue02" %> <%= link_to version.name, version_path(version), :class => "c_blue02" %>
</th> </th>
<th class="fl w80"><%= format_date(version.effective_date) %></th> <th class="fl w80"><%= format_date(version.effective_date) %></th>
<th class="fl w350 hidden"><%=h version.description %></th> <th class="fl w350 hidden"><%=h version.description %></th>

3
app/views/versions/show.html.erb
View File

@ -11,10 +11,11 @@
<%= render :partial => 'versions/type_ico', :locals => {:version => @version} %> <%= render :partial => 'versions/type_ico', :locals => {:version => @version} %>
</ul> </ul>
<p class="fr mt3 c_grey02"> <p class="fr mt3 c_grey02">
<span class="muban-icons-clock "></span>
<% if @version.completed? %> <% if @version.completed? %>
<span class="muban-icons-clock "></span>
<%= format_date(@version.effective_date) %> <%= format_date(@version.effective_date) %>
<% elsif @version.effective_date %> <% elsif @version.effective_date %>
<span class="muban-icons-clock "></span>
<%= due_date_distance_in_words(@version.effective_date) %>(<%= format_date(@version.effective_date) %>) <%= due_date_distance_in_words(@version.effective_date) %>(<%= format_date(@version.effective_date) %>)
<% end %> <% end %>
</p> </p>

BIN
public/images/new_project/ico.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 KiB