This commit is contained in:
yanxd 2013-11-21 17:11:55 +08:00
parent a6d0482804
commit 67bec27f34
2 changed files with 182 additions and 79 deletions

View File

@ -5,9 +5,6 @@
<tr> <tr>
<td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td> <td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td>
</tr> </tr>
<!-- <tr>
<td class="font_welcome_Edescription">Trustie forge,a socialized collaboration platform for project management,software development and software crowdsourcing for creative university students and entrepreneurs.</td>
</tr> -->
</table> </table>
</div> </div>
<table> <table>
@ -15,63 +12,66 @@
<td> <%= call_hook :view_account_login_top %> <td> <%= call_hook :view_account_login_top %>
<div id="login-form_new"> <div id="login-form_new">
<%= form_tag(signin_path) do %> <%= form_tag(signin_path) do %>
<%= back_url_hidden_field_tag if is_logout? %> <%= back_url_hidden_field_tag if is_logout? %>
<% unless User.current.logged? %> <!--modified by young--> <% unless User.current.logged? %> <!--modified by young-->
<table> <table>
<tr> <tr>
<td align="right"><label for="username"><%= l(:label_username) %></label></td> <td align="right"><label for="username"><%= l(:label_username) %></label></td>
<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td> <td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
</tr> </tr>
<tr> <tr>
<td align="right"><label for="password"><%= l(:label_password) %></label></td> <td align="right"><label for="password"><%= l(:label_password) %></label></td>
<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td> <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
</tr> </tr>
<% if Setting.openid? %> <% if Setting.openid? %>
<tr> <tr>
<td align="right"><label for="openid_url"><%= l(:field_identity_url)%></label></td> <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> <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
</tr> </tr>
<% end %> <% end %>
<tr> <tr>
<td></td> <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> <td align="left">
</tr> <% if Setting.autologin? %> <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
<tr> <% end %>
<td align="left"> <% if Setting.lost_password? %> </td>
<%= link_to l(:label_password_lost), lost_password_path %> </tr>
<% end %> </td> <tr>
<td align="right"> <td align="left">
<input type="submit" name="login" value="<%= l(:button_login)%> &#187;" tabindex="5"/> <% if Setting.lost_password? %>
</td> <%= link_to l(:label_password_lost), lost_password_path %>
</tr> <% end %>
</table> </td>
<% else %> <td align="right">
<div> <input type="submit" name="login" value="<%= l(:button_login)%> &#187;" tabindex="5"/>
<!--info--> </td>
</tr>
<!-- modified by bai --> </table>
<table width="200" border="0"> <% else %>
<tr> <div>
<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> <!--info-->
</tr> <table width="200" border="0">
<tr> <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 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>&nbsp <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>&nbsp
<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> <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>
</tr> </tr>
<tr> <tr>
<td align="left"><% unless User.current.memberships.empty? %> <td align="left"><% unless User.current.memberships.empty? %>
<%= l(:label_x_welcome_participate, :count => User.current.memberships.count) %> <strong class="font_small_watch"><%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %></strong> <%= l(:label_welcome_participate_project)%> <%= l(:label_x_welcome_participate, :count => User.current.memberships.count) %> <strong class="font_small_watch"><%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %></strong> <%= l(:label_welcome_participate_project)%>
<% end %> <% end %>
</td> </td>
</tr> </tr>
</table> </table>
<!-- end --> </div>
</div> <% end %>
<% end %> <% end %>
<% end %> </div>
</div> <%= call_hook :view_account_login_bottom %> <%= call_hook :view_account_login_bottom %>
<% if params[:username].present? %> <% if params[:username].present? %>
<%= javascript_tag "$('#password').focus();" %> <%= javascript_tag "$('#password').focus();" %>
@ -100,37 +100,78 @@
} }
} }
</script> </script>
<%= stylesheet_link_tag 'welcome' %>
<div class="body_resize">
<div class="right">
<div class="home">热门项目</div>
<div class="project">
<span style="overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;">
<a href="#" >Trustie1balabalbalabalbalabalbalabalbalabalbalabalbbalabalbalabalbalabalbalabalbalabalbalabal</a>
</span>
<span class="grey">This is a project!balabalabalabala...</span></div>
</div>
<!-- p class="grey">Fusce vehicula dignissim ligula. Vestibulum sit amet neque eu neque suscipit consequat quis vel risus. </p>
<p><strong>Vestibulum vehicula purus nec dui accumsan fermentum.</strong> Suspendisse potenti. Ut dapibus est id odio pretium blandit in eget leo. Aliquam erat volutpat. Curabitur blandit </p>
<p class="grey">&nbsp;</p -->
</div>
<div class="left">
<div class="home" >新手指引 &amp; 问答</div>
<!-- p><strong><em> 5th / April / 2009 </em></strong></p>
<p>Integer mauris. Cras iaculis viverra dolorqw. Nulla suscipit. </p -->
<div class="project"> <a href="#" ><span >新手入门指引帖 && FAQ bala...</span></a> <span class="grey"><strong><em>[ Trustie ]</em></strong></span></div>
</div>
<div class="clr"></div>
</div>
<!-- end -->
<br/><br/><br/><br/><br/><br/><br/>
<!-- end --> <!-- end -->
<div> <div>
<table width="700" border="0" align="center" style="padding-top: 0px"> <table width="700" border="0" align="center" style="padding-top: 0px">
<tr><td colspan="5" align="center" style="padding-bottom: 10px; font-size: 18px; font-color: #5c5c5c ; font-family: 微软雅黑"><%= l(:label_welcome_leave_message) %> <strong><%= toggle_link l(:label_welcome_click_me), 'put-bid-form', {:focus => 'new_form_project_message'} %></strong></td></tr> <tr>
<td colspan="5" align="center" style="padding-bottom: 10px; font-size: 18px; font-color: #5c5c5c ; font-family: 微软雅黑"><%= l(:label_welcome_leave_message) %> <strong><%= toggle_link l(:label_welcome_click_me), 'put-bid-form', {:focus => 'new_form_project_message'} %></strong>
</td>
</tr>
<tr><td colspan="5" align="center" ><div class="homepage_underline"></div></td></tr> <tr><td colspan="5" align="center" ><div class="homepage_underline"></div></td></tr>
<tr><td colspan="5" align="center"> <tr>
<div id="put-bid-form" style="display: none"> <td colspan="5" align="center">
<%= form_for('new_form', :method => :post, <div id="put-bid-form" style="display: none">
:url => {:controller => 'words', :action => 'add_project_respond'}) do |f|%> <%= form_for('new_form', :method => :post, :url => {:controller => 'words', :action => 'add_project_respond'}) do |f|%>
<table border="0" width="525px" align="center" >
<table border="0" width="525px" align="center" > <tr>
<tr> <td>
<td><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "#{l(:label_welcome_my_respond)}", :onfocus => "clearInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", :onblur => "showInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')", :style => "resize: none;", :class => 'noline'%></td> <%= f.text_area 'project_message',
</tr> :rows => 3,
</table> :cols => 65,
<table border="0" width="525px" align="center"> :value => "#{l(:label_welcome_my_respond)}",
<tr> :onfocus => "clearInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')",
<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %></td> :onblur => "showInfo('new_form_project_message','#{l(:label_welcome_my_respond)}')",
</tr> :style => "resize: none;",
</table> :class => 'noline'%>
<% end %> </td>
</div></td> </tr>
</table>
<table border="0" width="525px" align="center">
<tr>
<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %></td>
</tr>
</table>
<% end %>
</div>
</td>
</tr> </tr>
</tr> </table>
</table>
</div> </div>
<div style="padding-top: 40px"></div> <div style="padding-top: 40px"></div>

View File

@ -0,0 +1,62 @@
.body_resize { width:950px; margin:0 auto; padding:0;}
.left { width:371px; float:left; margin:20px 5px 10px 5px; padding:5px;}
.right { width:527px; float:left; margin:20px 5px 10px 5px; padding:5px;}
.right ul { list-style:none; margin:5px 20px; padding:0;}
.right li { font: bold 12px Arial, Helvetica, sans-serif; color:#6f6f6f; padding:5px 20px; margin:0; background:url(images/about_ul_li.gif) left no-repeat;}
.body { background:#ebebeb; border-bottom:1px solid #fff; } /*没用到*/
.home {
font:bold 16px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#2c2c2c;
border-bottom:1px solid #cccccc;
padding:10px 5px;
margin:0 0 10px 0;
}
p {
font:normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#6f6f6f;
line-height:1.8em;
padding:5px 5px;
margin:0;
}
div.project {
font:normal 15px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#6f6f6f;
line-height:1.8em;
padding:5px 5px;
margin:0;
border-bottom:1px solid #eeeeee;
width: 95%;
float: right;
}
div.project a{
color: #5B5B5B;
}
/*div.project{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}*/
span.grey {
float: right;
font: normal 13px Helvetica, Tahoma, Arial, STXihei, "华文细黑", "Microsoft YaHei", "微软雅黑", SimSun, "宋体", Heiti, "黑体", sans-serif;
color:#afaeae;
line-height:1.8em;
padding:5px 5px;
margin:0;
}
p.clr, .clr { clear:both; padding:0; margin:0; background:none;}