diff --git a/app/views/welcome/_search_bar.html.erb b/app/views/welcome/_search_bar.html.erb new file mode 100644 index 000000000..73a497835 --- /dev/null +++ b/app/views/welcome/_search_bar.html.erb @@ -0,0 +1,8 @@ +
+ <%= form_tag( search_stores_path, method: 'post') do %> + <%= text_field_tag 'name', params[:name], placeholder:'请输入要搜索的关键字', name: "name", :class => 'blueinputbar', :style => 'width:300px;'%> +    + <%= submit_tag l(:label_search), :class => "enterprise"%> + <% end %> +
全站文件搜索。不会搜索私有项目中的内容和学生已经提交的作业。
+
\ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 74d7a4a2a..86846ca6a 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,76 +1,4 @@ -
-
- <%= image_tag '/images/qrweixin.jpg', size: '200x200', alt: 'trustie', class: "weixin" %> -

微信扫码

-
-
- <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> -
-
- <%= call_hook :view_account_login_top %> -
- <%= form_tag(signin_path) do %> - <%= back_url_hidden_field_tag if is_logout? %> - <% unless User.current.logged? %> - - - - - - - - - - - - - - - - - -
<%= text_field_tag 'username', params[:username], :tabindex => '1' %>
<%= password_field_tag 'password', nil, :tabindex => '2' %>
<% if Setting.autologin? %> <% end %>
- <% if Setting.lost_password? %> - <%= link_to l(:label_password_lost), lost_password_path %> - <% end %> - - - -
- <% else %> -
- - - - - - - - - - - -
<%= l(:label_welcome) %> <%=link_to (User.current.lastname+User.current.firstname), user_path(User.current) %> <%= l(:label_join) %>
<%= image_tag(url_to_avatar(User.current), :class => 'avatar') %><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %>  - <%=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) %>
<% unless User.current.memberships.empty? %> - <%= l(:label_x_welcome_participate, :count => User.current.memberships.count) %> <%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %> <%= l(:label_welcome_participate_project)%> - <% end %> -
-
- <% end %> - <% end %> -
- <%= call_hook :view_account_login_bottom %> - - <% if params[:username].present? %> - <%= javascript_tag "$('#password').focus();" %> - <% else %> - <%= javascript_tag "$('#username').focus();" %> - <% end %> -
-
- -
- +
+ +
+
+ <%= l(:label_welcome_trustie) %> , <%= l(:label_welcome_trustie_description) %> +
+
+ <%= render :partial => "search_bar"%> +
+
+
+
+ +
+ + <%= stylesheet_link_tag 'welcome' %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index ae82ef9ba..5cf04dda4 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -258,7 +258,7 @@ span.forums-avatar-right{ text-overflow: ellipsis; } .contextual-borad{ - /*float:right;*/ + float:right; white-space: nowrap; line-height:1.4em; margin-top:0px; @@ -752,9 +752,12 @@ ul.tool li{list-style-type:none; .welcome_left{ float:left; display:inline-block; - margin-top: 50px; + /*margin-top: 50px;*/ padding-left: 20px; max-width: 380px; + margin: 0; + padding: 0; + margin-left: 60px; } .welcome_right{ @@ -1371,7 +1374,7 @@ table.attributes { width: 100% } table.attributes th { vertical-align: top; text-align: left; } table.attributes td { vertical-align: top; } -table.boards a.board, h3.comments { /*background: url(../images/comment.png) no-repeat 0% 50%; */padding-left: 5px; } +table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; } table.boards td.topic-count, table.boards td.message-count {text-align:center;} table.boards td.last-message {font-size:80%;} @@ -2458,7 +2461,7 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} .icon-edit { background-image: url(../images/edit.png); } .icon-copy { background-image: url(../images/copy.png); } .icon-duplicate { background-image: url(../images/duplicate.png); } -.icon-del { /*background-image: url(../images/delete.png); */} +.icon-del { background-image: url(../images/delete.png); } .icon-move { background-image: url(../images/move.png); } .icon-save { background-image: url(../images/save.png); } .icon-cancel { background-image: url(../images/cancel.png); } @@ -2483,7 +2486,7 @@ a.close-icon:hover {background-image:url('../images/close_hl.png');} .icon-checked { background-image: url(../images/true.png); } .icon-details { background-image: url(../images/zoom_in.png); } .icon-report { background-image: url(../images/report.png); } -.icon-comment { /*background-image: url(../images/comment.png); */} +.icon-comment { background-image: url(../images/comment.png); } .icon-summary { background-image: url(../images/lightning.png); } .icon-server-authentication { background-image: url(../images/server_key.png); } .icon-issue { background-image: url(../images/ticket.png); } diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css index e6fbb81bb..bd82fc56f 100644 --- a/public/stylesheets/welcome.css +++ b/public/stylesheets/welcome.css @@ -320,3 +320,53 @@ div#tooltip::after { a.attachments_list_color { color: grey; } +.search-bar { + margin: 0; + padding: 0; + float: right; + margin-top: 10px; + margin-right: 60px; +} +.main-content-bar{ + margin: 0; + padding: 0; + margin-bottom: 30px; + width: 100%; + height: auto; +} + +.weixin-content{ + margin: 0; + padding: 0; + text-align: center; +} + +#identifier-pannel{ + position:fixed; + left: 50%; + bottom:0; + z-index:9999; + width:150px; + margin-left:500px; +} +#identifier-pannel a:link,#identifier-pannel a:visited{ + display:block; + padding:10px; + line-height:18px; + font-size:12px; + color:#333; + text-decoration:none; + white-space:nowrap; + text-align:center; + background:#f9f9f9; +} +#identifier-pannel a:hover{ + background:#ccd8db; + color:#000; +} +#identifier-pannel img{ + display:block; + margin:5px auto; + border:none; +} +