From 948533cdac298ecdf5ddb658571ddae76c9ff581 Mon Sep 17 00:00:00 2001
From: pelick <369447122@qq.com>
Date: Tue, 7 May 2013 21:36:43 +0800
Subject: [PATCH] new web design in home.jsp~~

---
 AcademicSearchEngine/WebContent/about.jsp     |  21 +--
 AcademicSearchEngine/WebContent/home.jsp      | 122 +++++++++++-------
 AcademicSearchEngine/WebContent/smallhead.jsp |   4 +-
 3 files changed, 77 insertions(+), 70 deletions(-)

diff --git a/AcademicSearchEngine/WebContent/about.jsp b/AcademicSearchEngine/WebContent/about.jsp
index ecec8f0..baf3032 100644
--- a/AcademicSearchEngine/WebContent/about.jsp
+++ b/AcademicSearchEngine/WebContent/about.jsp
@@ -14,26 +14,7 @@
 </head>
 <body> 
   <s:include value="smallhead.jsp"></s:include>
- 
-  <!-- 搜索框 -->
-  <div class="container">
-    <div class="tabbable"> <!-- Only required for left/right tabs -->
-      <ul class="nav nav-tabs">
-        <li class="active"><a href="#tab1" data-toggle="tab">Reseacher</a></li>
-        <li><a href="#tab2" data-toggle="tab">Publication</a></li>
-      </ul>
-      <div class="tab-content">
-        <div class="tab-pane active" id="tab1">
-          <p>Howdy, I'm in Section 1.</p>
-        </div>
-        <div class="tab-pane" id="tab2">
-          <p>Howdy, I'm in Section 2.</p>
-        </div>
-      </div>
-    </div>
-  </div>
-  
-  
+
   <div class="container" id="home_container">
     <div id="myCarousel" class="carousel slide">
         <ol class="carousel-indicators">
diff --git a/AcademicSearchEngine/WebContent/home.jsp b/AcademicSearchEngine/WebContent/home.jsp
index e87a64b..5b072e5 100644
--- a/AcademicSearchEngine/WebContent/home.jsp
+++ b/AcademicSearchEngine/WebContent/home.jsp
@@ -49,8 +49,8 @@
       </div>
     </div>
   </div>
+  
   <div class="container">
-
   <%
 	Object object = request.getSession().getAttribute("_const_cas_assertion_");
 	Assertion assertion = (Assertion) object;
@@ -72,62 +72,88 @@
 	  homepage = (String) map.get("homepage");
 	}
   %>
-  <div class="jumbotron">
-    <h1 class="muted"><%=name%></h1>
-    <h2><small><%=email%></small></h2>
-    <p class="lead">I`m interested in <strong><%=interests%></strong>. You can <i class="icon-envelope"></i>
-    <em><%=email%></em>. </p>
+  <div class="jumbotron media well">
+    <h2 class="muted"><%=name%></h2>
+    <h3><i class="icon-envelope"></i><small><em><%=email%></em></small></h3>
+    <p class="lead">I`m interested in <strong><%=interests%></strong>.</p>
     <a class="btn btn-large btn-danger" href="<%=weibo_url%>">Follow Me on Weibo</a>
     <a class="btn btn-large btn-inverse" href="<%=github_url%>">Follow Me on Github</a>
   </div>
   
-  <div class="page-header"></div>
-  
-  <div class="row-fluid">
-    <div class="span6">
-      <h2>Favor Authors</h2>
-      <button class="btn" type="button" id="user_author_btn" user="<%=loginName%>">Click</button>
-      <div id="user_author"></div>
-      <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div>
-    <div class="span6">
-      <h2>Favor Papers</h2>
-      <button class="btn" type="button" id="user_paper_btn" user="<%=loginName%>">Click</button>
-      <div id="user_paper"></div>
-      <p><a class="btn" href="#">View details &raquo;</a></p>
+  <div class="container">
+    <div class="tabbable tabs-left"> 
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#tab1" data-toggle="tab">我的收藏</a></li>
+        <li><a href="#tab2" data-toggle="tab">推荐给我</a></li>
+        <li><a href="#tab3" data-toggle="tab">我的分享</a></li>
+        <li><a href="#tab4" data-toggle="tab">我的历史</a></li>
+      </ul>
+      <div class="tab-content">
+        <div class="tab-pane active" id="tab1">
+          <div class="tabbable">
+            <ul class="nav nav-pills">
+              <li class="active"><a href="#tab11" data-toggle="tab">我收藏的学者</a></li>
+              <li><a href="#tab12" data-toggle="tab">我收藏的论文</a></li>
+            </ul>
+            <div class="tab-content">
+              <div class="tab-pane active" id="tab11">
+                <button class="btn" type="button" id="user_author_btn" user="<%=loginName%>">Click</button>
+                <div id="user_author"></div>
+              </div>
+              <div class="tab-pane" id="tab12">
+                <button class="btn" type="button" id="user_paper_btn" user="<%=loginName%>">Click</button>
+                <div id="user_paper"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="tab-pane" id="tab2">
+          <div class="alert alert-error">
+            <strong>论文</strong> 收藏了XXX的用户，还收藏了。。。
+          </div>
+          <div class="alert alert-warning">
+            <strong>论文</strong> 收藏了XXX的用户，还收藏了。。。
+          </div>
+          <div class="alert alert-success">
+            <strong>论文</strong> 收藏了XXX的用户，还收藏了。。。
+          </div>
+          <div class="alert alert-info">
+            <strong>论文</strong> 收藏了XXX的用户，还收藏了。。。
+          </div>
+        </div>
+        <div class="tab-pane" id="tab3">
+          
+        </div>
+        <div class="tab-pane" id="tab4">
+          <div class="tabbable">
+            <ul class="nav nav-pills">
+              <li class="active"><a href="#tab41" data-toggle="tab">搜索历史</a></li>
+              <li><a href="#tab42" data-toggle="tab">收藏历史</a></li>
+              <li><a href="#tab43" data-toggle="tab">发现历史</a></li>
+            </ul>
+            <div class="tab-content">
+              <div class="tab-pane active" id="tab41">
+                <button class="btn" type="button" id="search_history_btn" user="<%=loginName%>">Click</button>
+                <div id="search_history"></div>
+              </div>
+              <div class="tab-pane" id="tab42">
+                <button class="btn" type="button" id="save_history_btn" user="<%=loginName%>">Click</button>
+                <div id="save_history"></div>
+              </div>
+              <div class="tab-pane" id="tab43">
+                <button class="btn" type="button" id="discover_history_btn" user="<%=loginName%>">Click</button>
+                <div id="discover_history"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
   
+
   <div class="page-header"></div>
   
-  <div class="row-fluid">
-    <div class="span6">
-      <h2>Discover History</h2>
-      
-      <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div>
-    <div class="span6">
-      <h2>Search History</h2>
-      
-      <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div>
-  </div>
-  
-  <div class="page-header"></div>
-  
-  <div class="row-fluid">
-    <div class="span6">
-      <h2>My Share</h2>
-      
-      <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div>
-    <div class="span6">
-      <h2>My Friend</h2>
-      
-      <p><a class="btn" href="#">View details &raquo;</a></p>
-    </div>
-  </div>
-  
   </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/AcademicSearchEngine/WebContent/smallhead.jsp b/AcademicSearchEngine/WebContent/smallhead.jsp
index 404dedd..f4e7f3f 100644
--- a/AcademicSearchEngine/WebContent/smallhead.jsp
+++ b/AcademicSearchEngine/WebContent/smallhead.jsp
@@ -17,7 +17,7 @@
       <a class="brand" href="#">Academic Search</a>
       <div class="nav-collapse collapse">
         <ul class="nav">
-          <li class="active">
+          <li>
             <a href="home.jsp">Home</a>
           </li>
           <li>
@@ -26,7 +26,7 @@
           <li>
             <a href="discover.jsp">Discover</a>
           </li>
-          <li>
+          <li class="active">
             <a href="about.jsp">About</a>
           </li>
         </ul>