welcome index css.
This commit is contained in:
parent
36d7068ba3
commit
1af4e4f712
|
@ -8,16 +8,6 @@
|
|||
<%= content_tag('div', "#{link_to(l(:label_layouts_feedback)+'(' + User.current.count_new_jour.to_s + ')', feedback_path(User.current))}".html_safe, :id => 'loggedas') if User.current.logged? %>
|
||||
<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
|
||||
<%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
|
||||
<!-- <div style="float: right; margin-top: 13px;">
|
||||
<%= content_tag('div', "#{link_to(image_tag('/images/mes.png'), feedback_path(User.current))}".html_safe, :title => "留言") if User.current.logged? %>
|
||||
</div> -->
|
||||
<!-- <div align="center" style="float: right; margin-right: -25px; margin-top: 6px; background: #ea7125; width: 12px;border-radius:7px; font-size: 8px; color: #fff; font-weight: bold">
|
||||
<%= User.current.count_new_jour if User.current.logged? && User.current.count_new_jour != 0 %>
|
||||
</div> -->
|
||||
<!-- <%= content_tag('div', "#{}".html_safe, :id => 'loggedas')%> -->
|
||||
<!-- 消息#{link_to((User.current.count_new_jour), feedback_path(User.current))} -->
|
||||
<!-- <%= content_tag('div', "消息(#{User.current.journals_for_messages.count})".html_safe, :id => 'loggedas')%> -->
|
||||
<!-- <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -->
|
||||
</div>
|
||||
<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 0px;margin-top: -10px;"></div>
|
||||
|
||||
|
|
|
@ -1,18 +1,16 @@
|
|||
<!--add by huang-->
|
||||
<div style="height:220px;">
|
||||
<div class="welcome_left" style="margin-top: 60px">
|
||||
<table width="388px">
|
||||
<tr><td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td></tr>
|
||||
</table>
|
||||
<div style="height:200px; margin:0 auto;">
|
||||
<div class="welcome_left" style="max-width: 380px; float: left; margin: 20px 0px 0px 50px;">
|
||||
<p>
|
||||
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
|
||||
</p>
|
||||
</div>
|
||||
<table>
|
||||
<tr>
|
||||
<td> <%= call_hook :view_account_login_top %>
|
||||
<div id="login-form_new" style="margin-top: -20px;">
|
||||
<div style="display:inline;">
|
||||
<%= call_hook :view_account_login_top %>
|
||||
<div id="login-form_new" style="margin-left: 520px;">
|
||||
<%= form_tag(signin_path) do %>
|
||||
<%= back_url_hidden_field_tag if is_logout? %>
|
||||
<% unless User.current.logged? %> <!--modified by young-->
|
||||
<table >
|
||||
<% unless User.current.logged? %>
|
||||
<table>
|
||||
<tr>
|
||||
<td align="right"><label for="username"><%= l(:label_username) %></label></td>
|
||||
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
|
||||
|
@ -21,34 +19,29 @@
|
|||
<td align="right"><label for="password"><%= l(:label_password) %></label></td>
|
||||
<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
|
||||
</tr>
|
||||
<% if Setting.openid? %>
|
||||
<tr>
|
||||
<td align="right"><label for="openid_url"><%= l(:field_identity_url)%></label></td>
|
||||
<td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td align="left"> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label> <% end %> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left"> <% if Setting.lost_password? %>
|
||||
<td align="left">
|
||||
<% if Setting.lost_password? %>
|
||||
<%= link_to l(:label_password_lost), lost_password_path %>
|
||||
<% end %> </td>
|
||||
<% end %>
|
||||
</td>
|
||||
<td align="right">
|
||||
<input type="submit" name="login" value="<%= l(:button_login)%> »" tabindex="5"/>
|
||||
<!-- Kyrie -->
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<% else %>
|
||||
<div>
|
||||
<!--info-->
|
||||
<table width="200" border="0">
|
||||
<tr>
|
||||
<td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
<td rowspan="2" style="padding-left: 20px"><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></td>
|
||||
<td><strong class="font_small_watch"><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %></strong> 
|
||||
<strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %></strong></td>
|
||||
|
@ -60,24 +53,19 @@
|
|||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- end -->
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div> <%= call_hook :view_account_login_bottom %>
|
||||
</div>
|
||||
<%= call_hook :view_account_login_bottom %>
|
||||
|
||||
<% if params[:username].present? %>
|
||||
<%= javascript_tag "$('#password').focus();" %>
|
||||
<% else %>
|
||||
<%= javascript_tag "$('#username').focus();" %>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<!--model-->
|
||||
|
||||
<!-- fq -->
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" language="javascript">
|
||||
function clearInfo(id, content) {
|
||||
|
@ -93,107 +81,6 @@
|
|||
$('#' + id).val(content);
|
||||
}
|
||||
}
|
||||
|
||||
// $(function(){
|
||||
// var x = 10;
|
||||
// var y = 20;
|
||||
// $("span.tooltip").mouseover(function(e){
|
||||
// this.myTitle = this.title;
|
||||
// this.title = "";
|
||||
// var tooltip = "<div id='tooltip' style=' position: absolute;'><div class='arrow bottom right'></div>" + this.myTitle + "</div>";
|
||||
// $("body").append(tooltip);
|
||||
// $("#tooltip")
|
||||
// .css({
|
||||
// "top": (e.pageY + y) + "px",
|
||||
// "left": (e.pageX + x) + "px"
|
||||
// }).show("fast");
|
||||
// }).mouseout(function(){
|
||||
// this.title = this.myTitle;
|
||||
// $("#tooltip").remove();
|
||||
// }).mousemove(function(e){
|
||||
// $("#tooltip")
|
||||
// .css({
|
||||
// "top": (e.pageY + y) + "px",
|
||||
// "left": (e.pageX + x) + "px"
|
||||
// });
|
||||
// });
|
||||
// })
|
||||
|
||||
// $('li').mouseover(function(){
|
||||
// var id=$(this).attr('id');
|
||||
// alert(id);
|
||||
// });
|
||||
// $(function(){
|
||||
// $(".welcome-box-list-new").hide();
|
||||
// $("#hot-topic").bind("click", function(){
|
||||
// $(".welcome-box-list-new").hide();
|
||||
// $(".welcome-box-list").show();
|
||||
// $(this).css({
|
||||
// "border-top": "1px solid #717171",
|
||||
// "border-left": "1px solid #717171",
|
||||
// "border-bottom": "1px solid #FFFFFF",
|
||||
// "border-right": "1px solid #FFFFFF"
|
||||
// });
|
||||
// $("#new-topic").css({
|
||||
// "border-top": "1px solid #FFFFFF",
|
||||
// "border-left": "1px solid #FFFFFF",
|
||||
// "border-bottom": "1px solid #717171",
|
||||
// "border-right": "1px solid #717171"
|
||||
// });
|
||||
// });
|
||||
//
|
||||
// $("#new-topic").bind("click", function(){
|
||||
// $(".welcome-box-list").hide();
|
||||
// $(".welcome-box-list-new").show();
|
||||
// $(this).css({
|
||||
// "border-top": "1px solid #717171",
|
||||
// "border-left": "1px solid #717171",
|
||||
// "border-bottom": "1px solid #FFFFFF",
|
||||
// "border-right": "1px solid #FFFFFF"
|
||||
// });
|
||||
// $("#hot-topic").css({
|
||||
// "border-top": "1px solid #FFFFFF",
|
||||
// "border-left": "1px solid #FFFFFF",
|
||||
// "border-bottom": "1px solid #717171",
|
||||
// "border-right": "1px solid #717171"
|
||||
// });
|
||||
//
|
||||
// });
|
||||
// // $("#panel h5.head").bind("mouseout", function(){
|
||||
// // $(this).next().fadeOut();
|
||||
// // });
|
||||
// })
|
||||
// $(function(){
|
||||
// $("#new-topic").hover(function(){
|
||||
// $(this).css({
|
||||
// "border-top": "1px solid #717171",
|
||||
// "border-left": "1px solid #717171",
|
||||
// "border-bottom": "1px solid #FFFFFF",
|
||||
// "border-right": "1px solid #FFFFFF"
|
||||
// }),
|
||||
// $(this).css({
|
||||
// "border-top": "1px solid #FFFFFF",
|
||||
// "border-left": "1px solid #FFFFFF",
|
||||
// "border-bottom": "1px solid #717171",
|
||||
// "border-right": "1px solid #717171"
|
||||
// });
|
||||
// });
|
||||
// $("#hot-topic").hover(function(){
|
||||
// $(this).css({
|
||||
// "border-top": "1px solid #717171",
|
||||
// "border-left": "1px solid #717171",
|
||||
// "border-bottom": "1px solid #FFFFFF",
|
||||
// "border-right": "1px solid #FFFFFF"
|
||||
// }),
|
||||
// $(this).css({
|
||||
// "border-top": "1px solid #FFFFFF",
|
||||
// "border-left": "1px solid #FFFFFF",
|
||||
// "border-bottom": "1px solid #717171",
|
||||
// "border-right": "1px solid #717171"
|
||||
// });
|
||||
// });
|
||||
// })
|
||||
|
||||
</script>
|
||||
<style>
|
||||
.forum-topic li{
|
||||
|
@ -201,44 +88,17 @@
|
|||
}
|
||||
|
||||
</style>
|
||||
<!-- info display block -->
|
||||
|
||||
<%= stylesheet_link_tag 'welcome' %>
|
||||
<div class="body_resize">
|
||||
|
||||
<div class="left" style="float: left; height: 445px; width: 50%; margin-left: 30px;">
|
||||
<ul class="welcome-message-list" style="width: 90%; ">
|
||||
<div class="left" style="float: left; height: 445px; width: 50%; margin-left: 30px;">
|
||||
<ul class="welcome-message-list" style="width: 90%; ">
|
||||
<div class="forum-topic" style="height: 25px;">
|
||||
<h3 style="color: rgb(21, 188, 207);margin-left: 8px;"><strong>贴吧动态</strong></h3>
|
||||
<!-- <ul class="inner-content">
|
||||
<li>
|
||||
<a href="#" id="hot-topic">最热帖子</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#" id="new-topic">最新帖子</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">更多主题</a>
|
||||
</li>
|
||||
</ul> -->
|
||||
|
||||
<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", forums_path %></span>
|
||||
</div>
|
||||
<!-- <div class="welcome-box-list">
|
||||
<% find_hot_forum_topics.each do |topic|%>
|
||||
<li class="message-brief-intro" style="min-height: 25px;">
|
||||
<div style="display: inline-block; width: 100%;">
|
||||
<span style="color:gray; display: inline-block; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">
|
||||
<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;"%>
|
||||
</span>
|
||||
<br>
|
||||
<span style="margin-left: 20px; color: rgb(172, 174, 177); white-space: nowrap; font-size: 9pt !important;;"><%=l(:field_updated_on)%><%=time_tag_welcome(topic_last_time topic)%>前</span>
|
||||
<span style="margin-left: 5px; color: rgb(172, 174, 177) !important; white-space: nowrap;">
|
||||
由<%= link_to topic.author, user_path(topic.author), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);"%>发表
|
||||
</span>
|
||||
<span style="float: right; color: rgb(172, 174, 177); white-space: nowrap; font-size: 9pt !important;;">回复(<%= link_to topic.replies_count, topic.event_url %>)</span>
|
||||
</div>
|
||||
</li>
|
||||
<% end %>
|
||||
</div> -->
|
||||
|
||||
<div class="welcome-box-list-new">
|
||||
<% find_new_forum_topics(8).each do |topic|%>
|
||||
|
@ -248,7 +108,7 @@
|
|||
<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;"%>
|
||||
</span>
|
||||
<br>
|
||||
<span style="margin-left: 24px; color: rgb(172, 174, 177); white-space: nowrap; font-size: 9pt !important;;"><!-- <%=l(:field_updated_on)%> --><%=time_tag_welcome(topic_last_time topic)%>前</span>
|
||||
<span style="margin-left: 24px; color: rgb(172, 174, 177); white-space: nowrap; font-size: 9pt !important;;"><%=time_tag_welcome(topic_last_time topic)%>前</span>
|
||||
<span style="margin-left: 8px; margin-bottom: 0px; color: rgb(172, 174, 177) !important; white-space: nowrap;">
|
||||
由 <%= link_to topic.author ? topic.author : 'Anonymous', user_path(topic.author_id), :style => "font-size: 9pt !important; color: rgb(17, 102, 173);"%> 发表
|
||||
</span>
|
||||
|
@ -257,10 +117,10 @@
|
|||
</li>
|
||||
<% end %>
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="right" style="float: right; margin-right: 10px; height: 445px; width: 45%; ">
|
||||
<div class="right" style="float: right; margin-right: 10px; height: 445px; width: 45%; ">
|
||||
<ul class="user-welcome-message-list" style="width: 94%; margin-top: 0px;">
|
||||
<h3 style="margin-left: -5px; color: rgb(21, 188, 207)"><strong>用户动态</strong></h3>
|
||||
<span style="margin-top: -30px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'users', :action => 'index'} %></span>
|
||||
|
@ -271,18 +131,18 @@
|
|||
<%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %>
|
||||
</div>
|
||||
<div class="inner-right" style="float: right; width:86%; height: 100%; ">
|
||||
<span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;" %></span><!-- 发表了<%= find_all_event_type event %>:<span style="color: blue;"><%= link_to truncate(event.event_title, length: 30, omission:'...'), event.event_url %>
|
||||
</span> --><%= show_user_content event %>
|
||||
<span style="color: green;"><%= link_to event.event_author, (user_path(event.event_author) if event.event_author), :style => "color:green;" %></span><%= show_user_content event %>
|
||||
<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= time_tag_welcome event.event_datetime %>前</span> <span style="float: right; color: rgb(172, 174, 177);"><%= show_event_reply event %></span></p>
|
||||
</div>
|
||||
</li>
|
||||
<% end %>
|
||||
</div>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
|
||||
<h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h2>
|
||||
<h3 style="margin-left: 5px; color: #e8770d;"><strong>热门项目</strong></h3>
|
||||
<span style="margin-top: -20px;float: right; display: block;"><%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0} %></span>
|
||||
<div class="d-p-projectlist-box">
|
||||
<ul class="d-p-projectlist">
|
||||
|
@ -294,7 +154,6 @@
|
|||
<div style="float: left; margin-left: 10px; width: 360px;">
|
||||
<p class="layout">
|
||||
<span style="display: inline-block; width: 250px;"><%= link_to( project.name, project_path(project.id), :class => "d-g-blue d-p-project-name", :title => "#{project.name}")%></span>
|
||||
<!-- <span style="cursor: help; display: inline-block; float: right; color: #ec6300; background: url('/images/score.png') no-repeat scroll ;background-position: left center;" title="项目得分,综合考虑了项目的各项活动,反映了该项目的活跃程度" class="tooltip-#{project.id}"><%= show_grade project %></span> -->
|
||||
<%= content_tag "span", show_grade(project),
|
||||
:style => "cursor: pointer; display: inline-block; float: right; color: #ec6300; ",
|
||||
:title => "项目得分,综合考虑了项目的各项活动,反映了该项目的活跃程度",
|
||||
|
@ -388,9 +247,7 @@
|
|||
|
||||
|
||||
<br/><br/><br/><br/><br/><br/><br/>
|
||||
<!-- end -->
|
||||
<div style="padding-top: 40px"></div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -732,7 +732,7 @@ ul.tool li{list-style-type:none;
|
|||
.font_tool{
|
||||
font-family:微软雅黑;
|
||||
font-size:14px;
|
||||
color: 1a1a1a;
|
||||
color: #1a1a1a;
|
||||
padding-left: 6px;
|
||||
}
|
||||
|
||||
|
@ -743,8 +743,8 @@ ul.tool li{list-style-type:none;
|
|||
.welcome_left{
|
||||
margin-top: 70px;
|
||||
float:left;
|
||||
padding-left: 10px;
|
||||
width: 49%;
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
.welcome_right{
|
||||
|
|
Loading…
Reference in New Issue