Merge branch 'dev_newproject' into develop

app/views/projects/settings/_new_versions.html.erb

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

app/views/versions/show.html.erb

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