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

主页宽度调整、主页配置菜单调整

This commit is contained in:
cxt 2016-10-20 09:26:01 +08:00
parent 70c7b0d12c
commit dff47b586e
6 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/views/article_homepages/_article_show.html.erb
View File

@ -1,44 +1,45 @@
<div class="homepageContentContainer" style="margin-top: 25px;">
<div class="homepageContent">
<div class="postContainer mb10 pr">
<div class="homepageMainContent">
<div class="postRightContainer pr">
<% if User.current && User.current == @article.user %>
<div class="homepagePostSetting" id="message_setting_<%= @article.id%>" style="top: -25px;">
<ul>
<li class="homepagePostSettingIcon">
<ul class="homepagePostSettiongText">
<li>
<% if @article.id == @article.homepage.article_id %>
<%= link_to(
<%= link_to(l(:button_conf_base_homepage), user_homepages_path(:user_id=>@article.user_id), :class => 'postOptionLink' )%>
<%# if @article.id == @article.homepage.article_id %>
<%#= link_to(
l(:button_cancel_base_homepage),
{:controller => 'homepages',:action => 'cancel_homepage',:user_id=>@article.user_id,:id=>@article.homepage_id, :article_id => @article.id, :show => 1},
:method => :post,
:class => 'postOptionLink'
)%>
<% else %>
<%= link_to(
<%# else %>
<%#= link_to(
l(:button_set_base_homepage),
{:controller => 'homepages',:action => 'set_homepage',:user_id=>@article.user_id,:id=>@article.homepage_id, :article_id => @article.id, :show => 1},
:method => :post,
:class => 'postOptionLink'
) %>
<% end %>
</li>
<li>
<%= link_to(
l(:button_edit),
{:controller => 'article_homepages',:action => 'edit', :id => @article.id},
:class => 'postOptionLink'
) %>
</li>
<li>
<%= link_to(
l(:button_delete),
{:controller => 'article_homepages',:action => 'destroy', :id => @article.id},
:method => :delete,
:data => {:confirm => l(:text_are_you_sure)},
:class => 'postOptionLink'
) %>
<%# end %>
</li>
<!--<li>-->
<!--<%#= link_to(-->
<!--l(:button_edit),-->
<!--{:controller => 'article_homepages',:action => 'edit', :id => @article.id},-->
<!--:class => 'postOptionLink'-->
<!--) %>-->
<!--</li>-->
<!--<li>-->
<!--<%#= link_to(-->
<!--l(:button_delete),-->
<!--{:controller => 'article_homepages',:action => 'destroy', :id => @article.id},-->
<!--:method => :delete,-->
<!--:data => {:confirm => l(:text_are_you_sure)},-->
<!--:class => 'postOptionLink'-->
<!--) %>-->
<!--</li>-->
</ul>
</li>
</ul>

4
app/views/article_homepages/edit.html.erb
View File

@ -1,6 +1,6 @@
<div class="homepageContentContainer">
<div class="homepageContent">
<div class="postContainer mb10">
<div class="homepageMainContent">
<div class="homepagePostContainer mb10">
<%= labelled_form_for @article, :url =>{:controller=>'article_homepages',:action => 'update'},
:html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'article_form', :locals => {:is_edit => true, :f => f} %>

4
app/views/article_homepages/new.html.erb
View File

@ -1,6 +1,6 @@
<div class="homepageContentContainer">
<div class="homepageContent">
<div class="postContainer mb10">
<div class="homepageMainContent">
<div class="homepagePostContainer mb10">
<%= labelled_form_for @article, :url =>{:controller=>'article_homepages',:action => 'create'},
:html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'article_form', :locals => {:is_edit => false, :f => f} %>

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

@ -2,7 +2,7 @@
<% if User.current.logged?%>
<% if User.current == target%>
<li style="width: 119px; float: left; border-right: 1px solid #ddd;"><%= link_to("编辑基本资料", my_account_path, :class => "user_editinfo") %></li>
<li style="width: 118px; float: left;"><%= link_to '个人主页', user_homepages_path(:user_id => @user.id) , :class => "user_editinfo" %></li>
<li style="width: 118px; float: left;"><%= link_to '个人主页', homepage_user_path(@user), :class => "user_editinfo" %></li>
<li class="cl"></li>
<% else%>
<li style="width: 119px; float: left; border-right: 1px solid #ddd;">

1
config/locales/zh.yml
View File

@ -911,6 +911,7 @@ zh:
button_edit: 编辑
button_delete: 删除
button_approve: 批准
button_conf_base_homepage: 配置主页
button_set_base_homepage: 设为主页
button_cancel_base_homepage: 取消主页
button_set_homepage: 设为首页

3
public/stylesheets/css/public.css
View File

@ -1515,3 +1515,6 @@ a.syllabusbox_a_blue{
/*历史版本删除功能*/
.popup_ziyuan_title{ display: block; margin-left: 10px; text-align: left; max-width:360px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.homepagePostContainer {width:718px; border:1px solid #dddddd; padding:15px; background-color:#ffffff;}
.homepageMainContent {margin: 10px auto; width: 750px;}