From 747a109638bd564f4f65a2ab39c8901498ef9f5f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 16 Mar 2015 11:51:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0CSS=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=202=E3=80=81=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5HTML?=
=?UTF-8?q?=203=E3=80=81=E5=8E=BB=E6=8E=89base=5Fheader=E4=B8=AD=E6=B2=A1?=
=?UTF-8?q?=E7=94=A8=E7=9A=84erb=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/layouts/_base_header.html.erb | 33 ------
app/views/layouts/base.html.erb | 74 ++++++------
app/views/layouts/base_welcome.html.erb | 49 ++++++++
public/stylesheets/courses.css | 49 ++++++++
public/stylesheets/leftside.css | 59 ++++++++++
public/stylesheets/public.css | 150 ++++++++++++++++++++++++
6 files changed, 346 insertions(+), 68 deletions(-)
create mode 100644 app/views/layouts/base_welcome.html.erb
create mode 100644 public/stylesheets/courses.css
create mode 100644 public/stylesheets/leftside.css
create mode 100644 public/stylesheets/public.css
diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index 445a5abf4..75c39a407 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -1,32 +1,3 @@
-<%
- request.headers['REQUEST_URI'] = "" if request.headers['REQUEST_URI'].nil?
- realUrl = request.original_url
- if (realUrl.match(/.*forge\.trustie\.net\/*/))
- #@nav_dispaly_project_label = 1
- #@nav_dispaly_forum_label = 1
- elsif (realUrl.match(/.*course\.trustie\.net\/*/))
- #@nav_dispaly_course_all_label = 1
- #@nav_dispaly_forum_label = 1
- #@nav_dispaly_course_label = nil
- #@nav_dispaly_store_all_label = 1
- elsif (realUrl.match(/.*user\.trustie\.net\/*/))
- #@nav_dispaly_home_path_label = 1
- #@nav_dispaly_main_course_label = 1
- #@nav_dispaly_main_project_label = 1
- #@nav_dispaly_main_contest_label = 1
- elsif (realUrl.match(/.*contest\.trustie\.net\/*/))
- #@nav_dispaly_contest_label = 1
- #@nav_dispaly_store_all_label = 1
- else
- #@nav_dispaly_project_all_label = 1
- #@nav_dispaly_course_all_label = 1
- #@nav_dispaly_forum_label = 1
- #@nav_dispaly_bid_label = 1
- #@nav_dispaly_contest_label = 1
- #@nav_dispaly_store_all_label = 1
- #@nav_dispaly_user_label = 1
- end
-%>
<%= render :partial => "layouts/base_feedback" %>
-
-