as_user 0.0.3 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.0.4
+* optimize html structre and css
+* optimize navigator
+* move all flash messages to shared/messages
+
 == 0.0.3
 * basic user signup,signin,signout,update feature
 * no remember me

data/app/assets/javascripts/as_user/application.js

@@ -13,3 +13,5 @@
 //= require jquery
 //= require jquery_ujs
 //= require_tree .
+
+

data/app/assets/javascripts/as_user/common.js.coffee

@@ -0,0 +1,18 @@
+po = (obj,property,func) ->
+  str = ""
+  for prop of obj
+    if typeof(obj[prop]) != 'function'
+      if property != false
+        str += prop + ":" + obj[prop] + "\n"
+      else if func != false
+        str += prop + ":" + typeof(obj[prop]) + "\n"
+  str
+
+$(document).ready ->
+  $(".drop-down-menu s")
+    .bind "click", (event,ui) ->
+      $(".drop-down-menubox").show()
+
+  $(".message-box .close").bind "click", () ->
+    $(this).parent().remove()
+

data/app/assets/stylesheets/as_user/application.css

@@ -11,3 +11,4 @@
  *= require_self
  *= require_tree .
  */
+

data/app/assets/stylesheets/as_user/common.css

@@ -0,0 +1,146 @@
+/*jojo reset*/
+body, div, dl, dt, dd, ul, ol, li, p, h1, h2, h3, h4, h5, h6, pre, code, form, button, input, textarea, img, blockquote, th, td {margin:0;padding:0;vertical-align:baseline;}
+body {height:100%;font:63% "Microsoft YaHei";background:#f7f7f7 url(/assets/bg.jpg) repeat;}
+/* Tables still need 'cellspacing="0"' in the markup. */
+table { border-collapse:collapse;border-spacing:0;}
+h1, h2, h3, h4, h5, h6 {font-weight:normal;}
+ul, ol {list-style:none;}
+select, input{vertical-align:middle;}
+img {border:0 none;vertical-align:top;max-width:100%;height:auto;}
+button {cursor:pointer;}
+i,em{font-style:normal;}
+a{color:#333;text-decoration:none;}
+a:hover {text-decoration:underline;}
+a:focus {outline:none;}
+abbr, article, aside, bb, datagrid, datalist, details, dialog, eventsource, figure, figcaption, footer, header, mark, menu, meter, nav, output, progress, section, time, hgroup {display: block;height: auto;margin:0;padding:0;}
+
+/*global set*/
+.clearfix:after {content:".";display:block;height:0;clear:both;visibility:hidden;}
+.clearfix {display:inline-block;} /* Hides from IE-mac\*/
+.clearfix {display:block;} /* End hide from IE-mac*/
+
+/*===== header =====*/
+#header{position:fixed;left:0;top:0;width:100%;height:40px;padding:5px 0;border-bottom:1px solid #e4e4e4;background:#f7f7f7 url(/assets/bg.jpg) repeat;}
+#header:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.logo{position:relative;float:left;width:170px;height:40px;margin-left:3%;line-height:38px;background-color:#8b291c;}
+.logo strong,.drop-down-menu s,.main-nav .other em{background:url(/assets/sprice.png) no-repeat;}
+.logo strong{margin-left:26px;padding-left:36px;color:#fff;font-weight:normal;}
+.logo strong a{color:#fff;font-size:1.2em;}
+.logo strong a:hover{text-decoration:none;}
+.drop-down-menu{position:absolute;right:0px;top:0;}
+.drop-down-menu s{display:block;width:50px;height:40px;cursor:pointer;background-position:15px -29px;}
+.drop-down-menubox{display:none;position:absolute;right:0;top:40px;width:170px;}
+.dp-dw-mnlist{background-color:#c23d2b}
+.dp-dw-mnlist li{border-top:1px solid #cc5b4c;}
+.dp-dw-mnlist li a{display:block;height:30px;padding:0 10px;line-height:30px;color:#fff;font-size:14px;}
+.dp-dw-mnlist li a:hover{text-decoration:none;background-color:#cd5140;}
+.main-nav{float:left;margin:2px 0 0 3%;}
+.main-nav a{padding:0 20px;color:#000;font-weight:700;}
+.main-nav .addbtn{padding:2px 10px;font-size:1.6em;border-radius:3px;background-color:#e4e4e4;}
+.main-nav .delete{font-size:1.6em;}
+.main-nav .asked-by{font-size:1.6em;}
+.main-nav .addbtn i{margin-right:6px;font-size:1.4em;}
+.main-nav .other{display:inline-block;margin-top:7px;vertical-align:top;}
+.main-nav .other em{padding:0 31px 0 11px;cursor:pointer;font-size:1.6em;font-weight:700;background-position:52px -65px;}
+.main-nav .othercur em{padding:0 30px 0 10px;position:relative;border:1px solid #dcdcdc;border-bottom:none;background-color:#e7e7e7;background-position:51px -65px;}
+.other-menu{display:none;margin-top:-2px;border:1px solid #dcdcdc;background-color:#e7e7e7;}
+.ot-mn-list{padding-top:5px;}
+.ot-mn-list li a{display:block;height:28px;padding:0 10px;line-height:28px;font-size:1.2em;font-weight:normal;}
+.ot-mn-list li a:hover{text-decoration:none;background-color:#f1f1f1;}
+.main-nav a:hover{text-decoration:none;}
+.main-nav .line{margin:0 10px;color:#636363;font-size:1.6em;}
+.qa-top-search{position:relative;float:right;width:180px;height:28px;margin:5px 30px 0;border:1px solid #ccc;border-radius:10px;background-color:#fff;}
+.qa-top-search .input-txt{width:140px;padding:6px 8px;border:0 none;background:none;}
+.qa-top-search .search{position:absolute;right:7px;top:5px;width:19px;height:19px;cursor:pointer;text-align:center;font-size:0;line-height:0;border:0 none;background:#fff url(/assets/sprice.png) no-repeat 0 -88px;}
+
+.user-info{position:relative;float:right;margin:5px 3% 0 0;}
+.user-info .user{display:inline-block;width:20px;height:20px;margin-right:10px;}
+.user-info .hd{display:block;padding:5px;font-size:1.4em;cursor:pointer;}
+.user-info .hdcur{position:relative;padding:4px;border:1px solid #dcdcdc;border-bottom:0;background-color:#e7e7e7;}
+.user-menubox{display:none;margin-top:-1px;border:1px solid #dcdcdc;background-color:#e7e7e7;}
+.us-mn-list{padding-top:5px;}
+.us-mn-list li a{display:block;height:28px;padding:0 10px;line-height:28px;font-size:1.2em;font-weight:normal;}
+.us-mn-list li a:hover{text-decoration:none;background-color:#f1f1f1;}
+/*===== 消息提示 =====*/
+.message-box{margin:0 3%;padding-top:10px;color:#fff;clear:both;}
+.flash_error{padding:8px 10px;border-radius:5px;background-color:#eb7767;}
+.flash_alert{padding:8px 10px;border-radius:5px;background-color:#eb7767;}
+.flash_notice{padding:8px 10px;border-radius:5px;background-color:#7cb149;}
+.message-box strong{font-size:1.2em;}
+.message-box .close{float:right;color:#fff;padding:2px 5px;}
+.message-box .close:hover{text-decoration:none;background-color:#8b291c;}
+/*=====  =====*/
+#container{height:auto!important;height:630px;min-height:630px;margin-top:50px;}
+#container:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.main-con{float:left;width:70%;margin:40px 4% 0 3%;}
+.qa-list li{margin-bottom:40px;font-size:1.2em;}
+.qa-list li:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.qa-list .avatar{float:left;width:38px;margin-right:10px;}
+.qa-list .avatar img{display:block;width:38px;height:38px;}
+.qa-list .info{overflow:hidden;}
+.qa-list .name{margin-bottom:5px;color:#808080;}
+.qa-list .name a{margin-right:15px;text-decoration:underline;color:#808080;}
+.qa-list .time{display:inline;}
+.qa-list .con{margin-bottom:10px;line-height:1.6;color:#000;font-size:1.2em;}
+.qa-list .count span{margin-right:20px;color:#808080;}
+.qa-list .count a{color:#8b291c;}
+.pagination{padding:20px 0 40px;text-align:center;font-size:1.4em;}
+.pagination span a{margin-right:5px;padding:4px 10px;text-align:center;}
+.pagination .current{margin-right:5px;padding:4px 10px;border-radius:5px;background-color:#d8d8d8;}
+.pagination .gap{margin-right:10px;padding-left:5px;}
+.pagination span a:hover{text-decoration:none;border-radius:5px;background-color:#d8d8d8;}
+/*=====  =====*/
+.qa-search-box{margin-bottom:30px;}
+.qa-search-box .input-txt{width:70%;height:24px;margin-right:1%;padding:2px 5px;line-height:24px;border:1px solid #ccc;border-radius:5px;background-color:#fff;}
+.qa-search-box .search{width:8%;min-width:60px;height:30px;cursor:pointer;text-align:center;color:#fff;font-size:1.6em;border:0 none;border-radius:5px;background-color:#8b291c;}
+/*===== 详情页 =====*/
+.qa-details-box .hd{margin-bottom:20px;padding-bottom:15px;text-align:center;font-size:1.8em;border-bottom:1px solid #a0a0a0;}
+.qa-details-box .con{color:#333;font-size:1.4em;}
+.qa-details-box .con p{margin-bottom:20px;line-height:1.6;text-indent:2em;}
+.qa-details-box .count{margin-bottom:20px;text-align:right;color:#666;}
+.qa-details-box .count .author a{color:#666;text-decoration:underline;}
+.qa-details-box .count .line{padding:0 15px;color:#999;}
+/*=====  =====*/
+.leave-message{padding:20px 3%;background-color:#eaeaea;}
+.lv-ms-list li{margin-bottom:20px;font-size:1.2em;}
+.lv-ms-list li:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.lv-ms-list .avatar{float:left;width:38px;margin-right:10px;}
+.lv-ms-list .avatar img{display:block;width:38px;height:38px;}
+.lv-ms-list .info{overflow:hidden;}
+.lv-ms-list .name{margin-bottom:5px;color:#808080;}
+.lv-ms-list .name a{margin-right:15px;text-decoration:underline;color:#808080;}
+.lv-ms-list .time{display:inline;}
+.lv-ms-list .con{margin-bottom:10px;line-height:1.6;color:#000;font-size:1.2em;}
+.lv-ms-list .count{text-align:right;}
+.lv-ms-list .count span{margin-left:20px;color:#808080;}
+.lv-ms-list .count a{color:#8b291c;}
+
+.comment-box .input-area{width:98%;height:110px;margin-bottom:10px;padding:1%;border:1px solid #ccc;background-color:#fff;}
+.comment-box .btn{text-align:right;}
+.comment-box .submit{width:70px;height:26px;cursor:pointer;text-align:center;color:#fff;font-size:1.6em;border:0 none;background-color:#8b291c;}
+/*===== 登录页 =====*/
+.qa-login-box{position:absolute;left:50%;top:50%;width:300px;margin:0 0 0 -190px;padding:30px 40px;background-color:#d8d8d8;}
+.qa-login-box .item{margin-bottom:20px;font-size:1.4em;}
+.qa-login-box .item:after{content:".";display:block;height:0;clear:both;visibility:hidden;}
+.qa-login-box .item .field{float:left;width:58px;margin-right:10px;line-height:28px;text-align:right;}
+.qa-login-box .item .con{float:left;}
+.qa-login-box .input-txt{width:220px;height:24px;padding:2px;line-height:24px;border:1px solid #ccc;background-color:#fff;}
+.qa-login-box .btn{padding-top:10px;text-align:center;}
+.qa-login-box .submit{width:90px;height:26px;cursor:pointer;text-align:center;color:#fff;font-size:1.6em;border:0 none;background-color:#8b291c;}
+/*===== 提问页 =====*/
+.qa-quest-box .input-area{width:100%;height:200px;}
+.qa-quest-box .btn{text-align:right;}
+.qa-quest-box .submit{width:100px;height:26px;margin-top:10px;cursor:pointer;text-align:center;color:#fff;font-size:1.6em;border:0 none;background-color:#8b291c;}
+/*===== sidebar =====*/
+#sidebar{float:left;width:20%;margin:60px 3% 0 0;font-size:1.2em;}
+.ask-box .hd{margin-bottom:5px;}
+.ask-list li{height:22px;line-height:22px;overflow:hidden;}
+.ask-list li i{padding-right:5px;}
+.ask-list li a:hover{color:#8b291c;}
+.x-line{height:1px;margin:15px 0;background-color:#d8d8d8;}
+.hot-tag-box .hd{margin-bottom:5px;}
+.ht-tg-list li a{padding:2px 5px;color:#222;}
+.ht-tg-list li a:hover{text-decoration:none;border-radius:3px;background-color:#d8d8d8;}
+.ht-tg-list li span{margin-left:10px;font-size:1.8em;color:#999;}
+/*===== footer =====*/
+#footer{height:40px;margin-top:20px;padding-left:26px;line-height:40px;font-size:1.2em;border-top:1px solid #909090;}

data/app/assets/stylesheets/as_user/user.css

@@ -0,0 +1,9 @@
+.huge_nav_button {text-align:center;}
+.huge_nav_button a{position:relative;top:138px;border:#D5DBD3 6px solid;font-size:36px;text-decoration:none;border-radius:7px;background-color: #D5DBD3; }
+
+.intro_content {position:relative;top:238px;font-size:12px;text-decoration:none;border-radius:2px;}
+.intro_content a{text-decoration:none;border:#ddd 2px solid;font-size:10px;font-weight:normal;font-style:italic;border-radius:6px;}
+
+.main-nav a{font-size:1.6em;}
+
+.user-info .line{margin:0 10px;color:#636363;font-size:1.6em;}

data/app/controllers/as_user/abouts_controller.rb

@@ -5,7 +5,7 @@ module AsUser
     # GET /users
     # GET /users.json
     def index
-  
+      flash[:notice] = "Welcome"
     end
   end
 end

data/app/controllers/as_user/sessions_controller.rb

@@ -9,19 +9,21 @@ module AsUser
     end
 
     def create
-      user = User.find_by_email params[:session][:email].downcase
+      user = User.find_by_name(params[:session][:name]) || User.find_by_email(params[:session][:email].to_s.downcase)
       if user && user.authenticate(params[:session][:password])
         sign_in user
-        redirect_back_or user
+        redirect_back_or main_app.root_path
       else
-        flash.now[:error] = "Invalid email/password combination"
+        flash.now[:error] = "Invalid name(or email)/password combination"
         render 'new'
       end
     end
 
     def destroy
       sign_out
-      redirect_to root_path, notice: "signed out."
+      flash[:notice] = "signed out."
+      #redirect_back_or main_app.root_path
+      redirect_to main_app.root_path
     end
   
   end

data/app/controllers/as_user/users_controller.rb

@@ -7,7 +7,7 @@ module AsUser
     # GET /users
     # GET /users.json
     def index
-      @users = User.all
+      @users = User.order("created_at desc").page([params[:page].to_i, 1].max).per(100)
   
       respond_to do |format|
         format.html # index.html.erb
@@ -95,7 +95,7 @@ module AsUser
       if current_user
         unless current_user?(@user)
           flash[:error] = "can only modify your own account."
-          redirect_to root_path
+          redirect_to main_app.root_path
         end
       else
         store_location

data/app/helpers/as_user/shared_helper.rb

@@ -0,0 +1,19 @@
+module AsUser
+  module SharedHelper
+    def span_vertical_line
+      raw "<span class='line'>|</span>"
+    end
+
+    def space_filter(n)
+      raw "&nbsp;"*n
+    end
+
+    def link_main_app
+      link_to 'Home', main_app.root_path
+    end
+
+    def link_home
+      link_to 'Asuser_Home', root_path
+    end
+  end
+end

data/app/models/user.rb

@@ -8,21 +8,29 @@
 #  password_digest :string(60)
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
+#  nickname        :string(100)
 #
 
 class User < ActiveRecord::Base
   self.table_name = "users"
-  attr_accessible :email, :name, :password, :password_confirmation
+  attr_accessible :email, :name, :nickname, :password, :password_confirmation
   has_secure_password
 
   before_save {|user| user.email = email.downcase}
 
-  validates :name, presence: true, length: {maximum: 49}
+  VALID_NAME_REGEX = /^(?!_)(?!.*?_$)[a-zA-Z0-9_\u4e00-\u9fa5]{1,50}$/
   VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+  validates :name, presence: true,
+    format:         {with: VALID_NAME_REGEX},
+    uniqueness:     {case_sensitive: true}
   validates :email, presence: true,
     format:         {with: VALID_EMAIL_REGEX},
     uniqueness:     {case_sensitive: false}
   validates :password, :password_confirmation, presence: true, length: {minimum: 3}, if: Proc.new { |user|
     user.new_record? or user.password
   }
+
+  def to_s
+    self.nickname || self.name || "_guest"
+  end
 end

data/app/views/as_user/abouts/index.html.erb

@@ -1,10 +1,11 @@
-
-<br/>
-<br/>
-welcome to use as_user gem for user handling
-<br/>
-<br/>
-manual to be done...
-
-<%= link_to 'Signin', signin_path %>
-<%= link_to 'Signup', signup_path %>
+<div class="huge_nav_button">
+	<% if current_user %>
+		<%= link_to 'Detail', current_user %>
+		<%= space_filter(7) %>
+		<%= link_to 'Signout', signout_path, {method: :delete} %>
+	<%else%>
+		<%= link_to 'Signin', signin_path %>
+		<%= space_filter(7) %>
+		<%= link_to 'Signup', signup_path %>
+	<%end%>
+</div>

data/app/views/as_user/sessions/new.html.erb

@@ -1,18 +1,16 @@
-<h1>Sign in</h1>
+<%=content_for :nav do%>
+	<%= link_to 'Signup', signup_path %>
+<%end%>
 
-<div class="message_box">
-	<%= flash[:error] if flash[:error] %>
-</div>
-
-<div class="login_form">
-	<%= form_for(:session, url: sessions_path) do |f| %>
-		<%= f.label :email %>
-		<%= f.text_field :email %>
-
-		<%= f.label :password %>
-		<%= f.password_field :password %>
-
-		<%= f.submit "Sign in" %>
-	<%end%>
-</div>
+<%= form_for(:session, url: sessions_path) do |f| %>
+	<div class="qa-login-box">
+		<div class="item">
+			<%= f.label :email, class: "field" %><span class="con"><%= f.text_field :email, class: "input-txt" %></span>
+		</div>
+		<div class="item">
+			<%= f.label :password, class: "field" %><span class="con"><%= f.password_field :password, class: "input-txt" %></span>
+		</div>
+		<div class="btn"><%= f.submit "submit" %></div>
+	</div> 
+<%end%>
 

data/app/views/as_user/shared/_logo_nav.html.erb

@@ -0,0 +1,10 @@
+<h1 class="logo">
+	<strong><%=link_to "Home", main_app.root_path%></strong><s></s>
+	<div class="drop-down-menu"><s></s>
+		<div class="drop-down-menubox">
+			<ul class="dp-dw-mnlist">
+				<li><%=link_to "Asuser_Home", root_path%></li>
+			</ul>
+		</div>
+	</div>
+</h1>

data/app/views/as_user/shared/_messages.html.erb

@@ -0,0 +1,6 @@
+<% flash.each do |name, msg| %>
+  <%= content_tag :div, class: "flash_#{name}" do %>
+    <strong><%=msg%></strong>
+    <a href="#nogo" class="close">X</a>
+  <% end %>
+<% end %>

data/app/views/as_user/shared/_user_info.html.erb

@@ -0,0 +1,20 @@
+<div class="user-info">
+	<% if current_user %>
+		<strong class="hd">
+			<!--<img class="user" src="/assets/sample/no-avatar.jpg" width="20" height="20" alt=""/>-->
+			<%=link_to current_user, current_user%>
+		</strong>
+		<div class="user-menubox">
+			<ul class="us-mn-list">
+				<li><a href="#nogo">分享给好友</a></li>
+				<li><a href="#nogo">水豆腐水豆</a></li>
+				<li><a href="#nogo">士大夫</a></li>
+				<li><%=link_to "Signout", signout_path, method: :delete%></li>
+			</ul>
+		</div>
+	<%else%>
+		<!--
+		<strong class="hd"><%=link_to "Singin", signin_path%><span class="line">|</span><%=link_to "Singup", signup_path%></strong>
+		-->
+	<%end%>
+</div>

data/app/views/as_user/users/_form.html.erb

@@ -1,33 +1,24 @@
-<%= form_for(@user) do |f| %>
-  <% if @user.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+<div class="form-box">
+  <%= form_for(@user) do |f| %>
+    <% if @user.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
 
-      <ul>
-      <% @user.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
+        <ul>
+          <% @user.errors.full_messages.each do |msg| %>
+            <li><%= msg %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+
+    <table class="form-table">
+      <tr> <td> <%= f.label :name %></td> <td> <%= f.text_field :name %> </td> </tr>
+      <tr> <td> <%= f.label :email %></td> <td> <%= f.text_field :email %> </td> </tr>
+      <tr> <td> <%= f.label :password%></td> <td> <%= f.password_field :password%> </td> </tr>
+      <tr> <td> <%= f.label :password_confirmation %></td> <td> <%= f.password_field :password_confirmation %> </td> </tr>
+      <tr> <td colspan="2"> <%= f.submit %> </td> </tr>
+    </table>
 
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.text_field :email %>
-  </div>
-  <div class="field">
-    <%= f.label :name %><br />
-    <%= f.text_field :name %>
-  </div>
-  <div class="field">
-    <%= f.label :password%><br />
-    <%= f.password_field :password%>
-  </div>
-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation %>
-  </div>
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<% end %>
+  <% end %>
+</div>