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

修改 project-活动里面》》改成竖线

This commit is contained in:
huangjingquan 2013-08-12 20:51:21 +08:00
parent a3addb517c
commit 12090cdd80
4 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/projects/index.html.erb
View File

@ -2,20 +2,17 @@
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
<% end %> <% end %>
<div class="contextual" style="padding-top:10px;padding-right:10px;">
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
</div>
<%= form_tag(projects_path, :method => :get) do %> <%= form_tag(projects_path, :method => :get) do %>
<div class="project-search-block"> <div class="project-search-block">
<table width="100%" valign="center"> <span><%=l(:label_project_plural)%></span>
<tr>
<td width="8%"><span style="margin-left:0px"><%= l(:label_project_plural)%></span></td>
<td valign="center"><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %></td>
<td align="right">
<div class="project-search"> <div class="project-search">
<%= text_field_tag 'name', params[:name], :size => 30 %> <%= text_field_tag 'name', params[:name], :size => 30 %>
<%= submit_tag l(:label_search), :class => "small", :name => nil %> <%= submit_tag l(:label_search), :class => "small", :name => nil %>
</div></td> </div>
</tr>
</table>
</div> </div>
<% end %> <% end %>
@ -43,9 +40,7 @@
<%= form_tag({}, :method => :get) do %> <%= form_tag({}, :method => :get) do %>
<h3><%= l(:label_project_plural) %></h3> <h3><%= l(:label_project_plural) %></h3>
<label for="closed"><%= check_box_tag 'closed', 1, params[:closed] %> <%= l(:label_show_closed_projects) %></label> <label for="closed"><%= check_box_tag 'closed', 1, params[:closed] %> <%= l(:label_show_closed_projects) %></label>
<p> <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
</p>
<% end %> <% end %>
<% end %> <% end %>

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

@ -30,7 +30,7 @@
<td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong> <span class="font_lighter"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td> <td colspan="2" valign="top"><strong> <%= h(e.project) if @project.nil? || @project != e.project %></strong> <span class="font_lighter"><%= link_to_user(e.event_author) if e.respond_to?(:event_author) %> <%= l(:label_new_activity) %></span> <%= link_to format_activity_title(e.event_title), e.event_url %></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580px" ><p class="font_description"><%= format_activity_description(e.event_description) %></p></td> <td colspan="2" width="580px" ><p class="font_description"><%= textilizable(e.event_description) %></p></td>
</tr> </tr>
<tr> <tr>
<td align="left"><a class="font_lighter"><%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td> <td align="left"><a class="font_lighter"><%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>

BIN
public/images/button/bg104.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

13
public/stylesheets/application.css
View File

@ -26,6 +26,19 @@ h4 {border-bottom: 1px dotted #bbb;}
font-size:12px; font-size:12px;
} }
.project_top{
padding: 10px 20px;
}
.line{
width: 905px;
height: 1px;
margin: 0px;
background-color: #cacaca;
overflow: hidden;
margin-top: 10px;
}
ul.list_watch{list-style-type:none; ul.list_watch{list-style-type:none;
height:auto; height:auto;
border-bottom: 1px dashed rgb(204, 204, 204); border-bottom: 1px dashed rgb(204, 204, 204);