navigation bar update

colorgy · Feb 24, 2015 · 7cb5bda · 7cb5bda
1 parent 0912fe8
commit 7cb5bda
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 26 deletions.
diff --git a/app/assets/stylesheets/main/main.scss b/app/assets/stylesheets/main/main.scss
@@ -1405,9 +1405,9 @@ footer > p{
 }
 .push-menu-ul > li > a{
 	color: #ffffff;
-	font-size: 20px;
+	font-size: 15px;
 	text-align: left;
-	padding: 20px 30px;
+	padding: 15px 30px;
 	width: 100%;
 	transition: background-color 0.5s, color 0.5s;
 }
@@ -1511,3 +1511,15 @@ p.bjqs-caption{
 .home-dropdown .select2-arrow > b{
 	background-position: 0 8px !important;
 }
+.mobile-profile{
+	padding-bottom: 20px;
+	padding-top: 20px;
+	padding-left: 30px;
+
+	p{
+		font-size: 20px;
+		margin-left: 20px;
+		margin-top: 8px;
+		color: #fff;
+	}
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -81,15 +81,29 @@
   <body>
     <div class="push-menu">
         <div class="push-menu-container">
-          <h2  style="text-align:center; color:#fff;">Menu</h2>
           <ul class="push-menu-ul">
+            <% if current_user.blank? %>
+              <li>
+                <%= link_to "登入 / 註冊", user_omniauth_authorize_path(:colorgy), class: 'btn' %>
+              </li>
+            <% else %>
+              <li class="mobile-profile">
+                <div class="headphoto">
+                  <%= image_tag current_user.avatar_url %>
+                </div>
+                <p><%= current_user.name %></p>
+              </li>
+            <% end %>
             <li><%= link_to("書庫瀏覽", books_path) %></li>
-            <li><%= link_to("購物車", cart_items_path) %></li>
             <li><%= link_to("訂單查詢", bills_path) %></li>
             <li><%= link_to("我揪的團", groups_path) %></li>
             <li><%= link_to("使用流程", flow_path) %></li>
             <li><%= link_to("常見問題", faq_path) %></li>
             <li><a href="http://join.clg.io/">關於我們</a></li>
+            <% if current_user.blank? %>
+            <% else %>
+              <li><%= link_to("登出", "#{ENV['CORE_URL']}/logout") %></li>
+            <% end %>
           </ul>
         </div>
     </div>

diff --git a/app/views/pages/faq.html.erb b/app/views/pages/faq.html.erb
@@ -322,28 +322,6 @@
 	        		</p>
 	        	</div>
 	        </div>
-	        <div class="faqs-qa">
-	        	<div class="faqs-question">
-	        		<%= image_tag "close.png", class: "faqs" %>
-	        		<h4>網購不是有七天鑑賞期嗎，為什麼不能退換書？</h4>
-	        	</div>
-	        	<div class="faqs-answer">
-	        		<p>
-	        			一般而言，主揪在書籍送達、發書給同學時，都會「向同學再次確認書籍情況無誤」，才會讓同學收下使用。除非在書籍有本身問題、或是老師臨時換課本導致整班買錯書籍時，我們才會受理退換貨。因為我們有請主揪再向大家確認商品狀態是否無誤，原則上就已經「不具有網路購物無法確認貨品狀態的風險」，故我們無法受理。
-	        		</p>
-	        	</div>
-	        </div>
-	        <div class="faqs-qa">
-	        	<div class="faqs-question">
-	        		<%= image_tag "close.png", class: "faqs" %>
-	        		<h4>我可以叫別人幫我拿書嗎？</h4>
-	        	</div>
-	        	<div class="faqs-answer">
-	        		<p>
-	        			可以！主揪發書確認的是購書紀錄，不用本人到場。
-	        		</p>
-	        	</div>
-	        </div>
 	      </div>
 	    </div>
 	  </div>