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

Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision

This commit is contained in:
Jasder 2019-10-17 19:03:00 +08:00
parent 082056ae47 02ab992a57
commit eac3960d01
17 changed files with 192 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/home.rb
View File

@ -4,6 +4,10 @@ class Home < ActiveRecord::Base
has_one :cover, as: :coverable, dependent: :destroy
has_many :banners, dependent: :destroy
# validates_presence_of :name, :content, :frendly_id
# validates_format_of :friendly_id, :with => /\A[a-z0-9\-]+\z/
# before_validation :generate_friendly_id, :on => :create
validates_presence_of :name, :content
def more_content?

74
app/views/account/_introduce_activities.html.erb Normal file
View File

@ -0,0 +1,74 @@
<div class="middlePanel">
<p class="mt15 mb25">
<a href="javascript:void(0)" class="c_grey02">首页</a><span class="c_grey02 ml3 mr3">&gt;</span>
<span>行业动态</span>
</p>
<p class="f28 lh24">社区动态</p>
<ul class="introduce_a_list">
<li>
<img src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1189741410,4055697069&fm=26&gp=0.jpg" width="158px" height="100px" class="mr20"/>
<div>
<p class="mb25">
<a href="javascript:void(0)" class="f18 color-grey3 mr10 fl lh24">工业互联网体系架构2.0</a>
<span class="activitiesTag">行业动态</span>
<span class="f12 fontGrey4 fr"><i class="iconfont icon-shijian f14 fl mr5 lh18"></i>2019-03-01</span>
</p>
<p class="introduce_a_content break_full_word">
<span>网易考拉是网易在 2015 年 1 月上线公测的一项跨境电商业务，该业务一开始的品牌名称为 “考拉海购”。</span>
</p>
</div>
</li>
<li>
<img src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1189741410,4055697069&fm=26&gp=0.jpg" width="158px" height="100px" class="mr20"/>
<div>
<p class="mb25">
<a href="javascript:void(0)" class="f18 color-grey3 mr10 fl lh24">工业互联网体系架构2.0</a>
<span class="activitiesTag">行业动态</span>
<span class="f12 fontGrey4 fr"><i class="iconfont icon-shijian f14 fl mr5 lh18"></i>2019-03-01</span>
</p>
<p class="introduce_a_content break_full_word">
<span>网易考拉是网易在 2015 年 1 月上线公测的一项跨境电商业务，该业务一开始的品牌名称为 “考拉海购”。</span>
</p>
</div>
</li>
<li>
<img src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1189741410,4055697069&fm=26&gp=0.jpg" width="158px" height="100px" class="mr20"/>
<div>
<p class="mb25">
<a href="javascript:void(0)" class="f18 color-grey3 mr10 fl lh24">工业互联网体系架构2.0</a>
<span class="activitiesTag">行业动态</span>
<span class="f12 fontGrey4 fr"><i class="iconfont icon-shijian f14 fl mr5 lh18"></i>2019-03-01</span>
</p>
<p class="introduce_a_content break_full_word">
<span>网易考拉是网易在 2015 年 1 月上线公测的一项跨境电商业务，该业务一开始的品牌名称为 “考拉海购”。</span>
</p>
</div>
</li>
<li>
<img src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1189741410,4055697069&fm=26&gp=0.jpg" width="158px" height="100px" class="mr20"/>
<div>
<p class="mb25">
<a href="javascript:void(0)" class="f18 color-grey3 mr10 fl lh24">工业互联网体系架构2.0</a>
<span class="activitiesTag">行业动态</span>
<span class="f12 fontGrey4 fr"><i class="iconfont icon-shijian f14 fl mr5 lh18"></i>2019-03-01</span>
</p>
<p class="introduce_a_content break_full_word">
<span>网易考拉是网易在 2015 年 1 月上线公测的一项跨境电商业务，该业务一开始的品牌名称为 “考拉海购”。</span>
</p>
</div>
</li>
<li>
<img src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1189741410,4055697069&fm=26&gp=0.jpg" width="158px" height="100px" class="mr20"/>
<div>
<p class="mb25">
<a href="javascript:void(0)" class="f18 color-grey3 mr10 fl lh24">工业互联网体系架构2.0</a>
<span class="activitiesTag">行业动态</span>
<span class="f12 fontGrey4 fr"><i class="iconfont icon-shijian f14 fl mr5 lh18"></i>2019-03-01</span>
</p>
<p class="introduce_a_content break_full_word">
<span>网易考拉是网易在 2015 年 1 月上线公测的一项跨境电商业务，该业务一开始的品牌名称为 “考拉海购”。</span>
</p>
</div>
</li>
</ul>
</div>

2
app/views/homes/_home.html.erb
View File

@ -4,5 +4,5 @@
<p class="f16 c_grey02 break_full_word">
<%= truncate(home.content.html_safe, length: Home::SHOW_CONTENT_LENGTH) %>
</p>
<a href="<%= home.more_content? ? home_path(home) : 'JavaScript:void(0)'%>" class="homepage_activity_more <%= home.more_content? ? 'visit_color' : 'disabled_color' %>">MORE<span>→</span></a>
<!-- <a href="<%##= home.more_content? ? home_path(home) : 'JavaScript:void(0)'%>" class="homepage_activity_more <%#= home.more_content? ? 'visit_color' : 'disabled_color' %>">MORE<span>→</span></a>-->
</div>

1
app/views/layouts/base_project_community.html.erb
View File

@ -80,6 +80,7 @@
</div>
</div>
<div class="cl"></div>
<%= render :partial => 'layouts/footer' %>
<div class="cl"></div>

1
app/views/users/project_community.html.erb
View File

@ -1,3 +1,4 @@
<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
<input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
<div class="homepageRightBanner">

46
public/stylesheets/css/iconfont/demo_index.html
View File

@ -1320,6 +1320,18 @@
<div class="code-name">&amp;#xe6b7;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe60e;</span>
<div class="name">healthmode</div>
<div class="code-name">&amp;#xe60e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6be;</span>
<div class="name">nenghaofenxi@1x</div>
<div class="code-name">&amp;#xe6be;</div>
</li>
</ul>
<div class="article markdown">
<h2 id="unicode-">Unicode 引用</h2>
@ -3305,6 +3317,24 @@
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-healthmode"></span>
<div class="name">
healthmode
</div>
<div class="code-name">.icon-healthmode
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-nenghaofenxix"></span>
<div class="name">
nenghaofenxi@1x
</div>
<div class="code-name">.icon-nenghaofenxix
</div>
</li>
</ul>
<div class="article markdown">
<h2 id="font-class-">font-class 引用</h2>
@ -5054,6 +5084,22 @@
<div class="code-name">#icon-menu_people</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-healthmode"></use>
</svg>
<div class="name">healthmode</div>
<div class="code-name">#icon-healthmode</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-nenghaofenxix"></use>
</svg>
<div class="name">nenghaofenxi@1x</div>
<div class="code-name">#icon-nenghaofenxix</div>
</li>
</ul>
<div class="article markdown">
<h2 id="symbol-">Symbol 引用</h2>

16
public/stylesheets/css/iconfont/iconfont.css
View File

File diff suppressed because one or more lines are too long

BIN
public/stylesheets/css/iconfont/iconfont.eot
View File

Binary file not shown.

2
public/stylesheets/css/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

14
public/stylesheets/css/iconfont/iconfont.json
View File

@ -1509,6 +1509,20 @@
"font_class": "menu_people",
"unicode": "e6b7",
"unicode_decimal": 59063
},
{
"icon_id": "11222372",
"name": "healthmode",
"font_class": "healthmode",
"unicode": "e60e",
"unicode_decimal": 58894
},
{
"icon_id": "11230822",
"name": "nenghaofenxi@1x",
"font_class": "nenghaofenxix",
"unicode": "e6be",
"unicode_decimal": 59070
}
]
}

6
public/stylesheets/css/iconfont/iconfont.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 KiB

After

Width:  |  Height:  |  Size: 292 KiB

BIN
public/stylesheets/css/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
public/stylesheets/css/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
public/stylesheets/css/iconfont/iconfont.woff2
View File

Binary file not shown.

28
public/stylesheets/css/introduce.css
View File

@ -1,3 +1,6 @@
body{
background: #fff;
}
/*------------------------------------------------顶部banner*/
.homepage_banner{
width: 100%;
@ -107,6 +110,31 @@
line-height: 18px;
text-align: center;
}
/*行业动态-更多*/
.introduce_a_list li{
display: flex;
padding:25px 0px;
border-bottom:1px solid #EAEAEA ;
}
.introduce_a_list li > div{
flex:1;
}
.activitiesTag{
float: left;
padding:0px 8px;
height: 18px;
line-height: 18px;
background-color: #2878FF;
color: #fff;
margin-top: 2px;
}
.introduce_a_content{
max-width: 400px;
color: #666666;
font-size: 13px;
height: 75px;
justify-content: center;align-items: center;display: -webkit-flex
}
/*---------------------------------------------------------introduce*/
.homepage_introduce{

4
public/stylesheets/css/structure.css
View File

@ -667,3 +667,7 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.partnerInfo a span.imgLoGO{width: 124px;text-align: center;float: left;margin-right: 20px;}
.partnerInfo a span.name{font-size: 20px;color: #4D4D4D;float: left;}
.partnerInfo a{margin-right: 0px;}
.middlePanel{width: 1200px;margin:0px auto;}