diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb index 483cabac5..6bca696fc 100644 --- a/app/views/layouts/base.html.erb +++ b/app/views/layouts/base.html.erb @@ -17,19 +17,30 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> + <%= stylesheet_link_tag 'base','header', :media => 'all'%> + +
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
-<%=render :partial => 'layouts/base_header'%>
<%= render_flash_messages %> <%= yield %> <%= call_hook :view_layouts_base_content %>
- <%=render :partial => 'layouts/base_footer'%> + <%#=render :partial => 'layouts/base_footer'%>
@@ -41,6 +52,9 @@
+
+<%= render :partial => 'layouts/footer' %> +
<%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index eae133184..de75f7e2f 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -1,8 +1,3 @@ -<% @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 - @nav_dispaly_main_contest_label = 1 %> -<% @nav_dispaly_forum_label = 1%> @@ -20,14 +15,25 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - + <%= stylesheet_link_tag 'base','header', :media => 'all'%> + + +
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
-
- <%=render :partial => 'layouts/base_header'%> +
-
+
@@ -37,7 +43,7 @@ <%= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %> <%= text_field_tag 'name', params[:name], :size => 20 %> <%= hidden_field_tag 'forum_id', params[:id] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <% end %> @@ -46,46 +52,46 @@ -
<%= l(:label_projects_community)%> <%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %>
-
+ +
- + <%= render_flash_messages %> <%= yield %> <%= call_hook :view_layouts_base_content %>
- <%= render :partial => 'layouts/base_footer'%> + <%#= render :partial => 'layouts/base_footer'%>
+
+ <%= render :partial => 'layouts/footer' %> +
<%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/layouts/base_memos.html.erb b/app/views/layouts/base_memos.html.erb index dc2d3f33f..2831d642e 100644 --- a/app/views/layouts/base_memos.html.erb +++ b/app/views/layouts/base_memos.html.erb @@ -1,8 +1,3 @@ -<% @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 - @nav_dispaly_main_contest_label = 1 %> -<% @nav_dispaly_forum_label = 1%> @@ -20,13 +15,24 @@ <%= javascript_include_tag "ckeditor/ckeditor.js" %> <%= yield :header_tags -%> + <%= stylesheet_link_tag 'base','header', :media => 'all'%> + +
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
-
- <%=render :partial => 'layouts/base_header'%> +
@@ -78,7 +84,7 @@ <%= call_hook :view_layouts_base_content %>
- <%= render :partial => 'layouts/base_footer'%> + <%#= render :partial => 'layouts/base_footer'%>
+
+ <%= render :partial => 'layouts/footer' %> +
<%= call_hook :view_layouts_base_body_bottom %>
diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb index 98f4451f5..4048f23e5 100644 --- a/app/views/layouts/users_base.html.erb +++ b/app/views/layouts/users_base.html.erb @@ -1,8 +1,3 @@ -<% @nav_dispaly_home_path_label = 1 - @nav_dispaly_user_label = 1 - @nav_dispaly_store_all_label = 1 - %> -<% @nav_dispaly_forum_label = 1%> @@ -21,19 +16,29 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> + <%= stylesheet_link_tag 'base','header', :media => 'all'%> - + +
+
+ <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%> +
+
+
- <%=render :partial => 'layouts/base_header'%> + <%#=render :partial => 'layouts/base_header'%>
<%= render_flash_messages %> <%= yield %> <%= call_hook :view_layouts_base_content %>
- <%=render :partial => 'layouts/base_footer'%>
@@ -45,6 +50,11 @@
+ +
+<%= render :partial => 'layouts/footer' %> +
+ <%= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb index 6ce63bef6..b9495663e 100644 --- a/app/views/memos/_topic_form.html.erb +++ b/app/views/memos/_topic_form.html.erb @@ -7,10 +7,11 @@
- -
+ +
<%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
+
<%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
<% end %> \ No newline at end of file diff --git a/app/views/welcome/_link_to_another.html.erb b/app/views/welcome/_link_to_another.html.erb index 6540409d1..b5940a113 100644 --- a/app/views/welcome/_link_to_another.html.erb +++ b/app/views/welcome/_link_to_another.html.erb @@ -1,5 +1,6 @@ <%hidden_non_project = Setting.find_by_name("hidden_non_project") - visiable = hidden_non_project && hidden_non_project.value == "0"%> + visiable = true #hidden_non_project && hidden_non_project.value == "0" +%> <% unless visiable%>
<%=l(:label_projects_management_platform)%> diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css new file mode 100644 index 000000000..54b9c497e --- /dev/null +++ b/public/stylesheets/base.css @@ -0,0 +1,106 @@ +/* CSS Document */ +/* 2015-06-26 */ +body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;} +body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;} +div,img,tr,td,table{ border:0;} +table,tr,td{border:0;cellspacing:0; cellpadding:0;} +ol,ul,li{ list-style-type:none} +a:link,a:visited{text-decoration:none;} +/*a:hover,a:active{color:#000;}*/ +/*常用*/ +/*#RSide{ background:#fff;}*/ +/*上传图片处理*/ +#navHomepageSearch{margin-top: 11px;background-color: white;} +.upload_img img{max-width: 100%;} +blockquote img{max-width: 100%;} +.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +.none{display: none;} +.rside_back{ width:670px; margin-left:10px; background:#fff; margin-bottom:10px;} +.break_word{ word-break:break-all; word-wrap: break-word;} +select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; } +.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; background:#dbdbdb;} +.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} +/*table{ background:#fff;}*/ +.more{ font-weight:normal; color:#999; font-size:12px;} +.no_line{ border-bottom:none;} +.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} +.no_border{ border:none;background:none;} +.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;} +.db {display:block;} +/* font & color */ +.f12{font-size:12px; font-weight:normal;} +.f14{font-size:14px;} +.f16{font-size:16px;} +.f18{font-size:18px;} +.fb{font-weight:bold;} + +/* Float & Clear */ +.cl{ clear:both; overflow:hidden; } +.fl{float:left;display:inline;} +.fr{float:right;display:inline;} +.f_l{ float:left;} +.f_r{ float:right;} +.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} +.clearfix{clear:both;zoom:1} +.break_word{ word-break:break-all; word-wrap: break-word;} +.white_space{white-space:nowrap;} + +/* Spacing */ +.ml2{ margin-left:2px;} +.ml3{ margin-left:3px;} +.ml4{ margin-left:4px;} +.ml5{ margin-left:5px;} +.ml8{ margin-left:8px;} +.ml10{ margin-left:10px;} +.ml15{ margin-left:15px;} +.ml20{ margin-left:20px;} +.ml40{ margin-left:40px;} +.ml45{ margin-left:45px;} +.ml55{ margin-left:55px;} +.ml30{ margin-left:30px;} +.ml60{ margin-left:60px;} +.ml80{ margin-left:80px;} +.ml90{ margin-left:90px;} +.ml100{ margin-left:100px;} +.ml110{ margin-left:110px;} +.ml150 { margin-left:150px;} +.mr5{ margin-right:5px;} +.mr45 {margin-right:45px;} +.mr55{ margin-right:55px;} +.mr10{ margin-right:10px;} +.mr15 {margin-right:15px;} +.mr20{ margin-right:20px;} +.mr30{ margin-right:30px;} +.mr40{ margin-right:40px;} +.mw20{ margin: 0 20px;} +.mt3{ margin-top:3px;} +.mt5{ margin-top:5px;} +.mt8{ margin-top:8px;} +.mt10{ margin-top:10px !important;} +.mt15 {margin-top:15px;} +.mb4{ margin-bottom:4px;} +.mb5{ margin-bottom:5px;} +.mb8 {margin-bottom:8px;} +.mb10{ margin-bottom:10px !important;} +.mb20{ margin-bottom:20px;} +.pl15{ padding-left:15px;} +.w20{ width:20px;} +.w60{ width:60px;} +.w70{ width:70px;} +.w90{ width:90px;} +.w210{ width:210px;} +.w150{ width:150px;} +.w280{ width:280px;} +.w430{ width:470px;} +.w520{ width:520px;} +.w543{ width:543px;} +.w557{ width:557px;} +.w583{ width:583px;} +.w350{ width:350px;} +.w610{ width:610px;} +.w600{ width:600px;} +.h22{ height:22px;} +.h26{ height:26px;} +.h50{ height:50px;} +.h70{ height:70px;} +.h150{ height:150px;} \ No newline at end of file diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 8389afbb9..248284b11 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -8,7 +8,7 @@ /*.navHomepageMenu:hover {background-color:#0ea6b7;}*/ .navHomepageSearchBoxcontainer {margin-top:11px; } .navHomepageSearchBox {width:380px; border:none; outline:none; height:32px; margin-top:11px; background-color:#ffffff;} -.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none; float:left; padding-left:5px;; margin:0;} +.navHomepageSearchInput {width:345px; height:32px; outline:none; border:none !important; float:left;padding: 0 0 0 5px !important; margin:0;} .homepageSearchIcon {width:30px; height:32px; background:url(../images/nav_icon.png) -8px 3px no-repeat; float:left;} a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-repeat;} .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #98a1a6; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} @@ -64,8 +64,8 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;} .homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; } .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} -a.homepageWhite {color:#ffffff;} -a.homepageWhite:hover {color:#a1ebff} +a.homepageWhite {color:#ffffff !important;} +a.homepageWhite:hover {color:#a1ebff !important;} a.newsGrey {color:#4b4b4b;} a.newsGrey:hover {color:#000000;} a.replyGrey {color:#888888; display:inline-block;}