更换样式

zhangcaiyan · Oct 28, 2012 · 442d66f · 442d66f
1 parent a9ce25a
commit 442d66f
Show file tree

Hide file tree

Showing 16 changed files with 375 additions and 296 deletions.
diff --git a/app/models/fenlei.rb b/app/models/fenlei.rb
@@ -5,7 +5,7 @@ class Fenlei < ActiveRecord::Base
   belongs_to :user
 
   acts_as_list scope: [:user_id, :shouzhi]
-  validates :name, uniqueness: {scope: :user_id}, length: {in: 1..20}
+  validates :name, presence: true, uniqueness: {scope: :user_id}, length: {maximum: 20}
   validates :desc, length: {maximum: 1000}
 
   symbolize :shouzhi, in: [:zhichu, :shouru], methods: true, scopes: true

diff --git a/app/models/people.rb b/app/models/people.rb
@@ -6,6 +6,6 @@ class People < ActiveRecord::Base
 
   acts_as_list scope: :user
 
-  validates :name, uniqueness: {scope: :user_id}, length: {in: 1..20}
+  validates :name, presence: true, uniqueness: {scope: :user_id}, length: {maximum: 20}
   validates :desc, length: {maximum: 1000}
 end
diff --git a/app/models/zhangben.rb b/app/models/zhangben.rb
@@ -6,7 +6,7 @@ class Zhangben < ActiveRecord::Base
 
   acts_as_list scope: :user
 
-  validates :name, uniqueness: {scope: :user_id}, length: {in: 1..20}
+  validates :name, presence: true, uniqueness: {scope: :user_id}, length: {maximum: 20}
   validates :desc, length: {maximum: 1000}
 
 end
diff --git a/app/views/devise/registrations/bianji_mima.html.erb b/app/views/devise/registrations/bianji_mima.html.erb
@@ -1,26 +1,25 @@
 <%= title "修改密码" %>
 
-<%= render "partial/left_navigation" %>
 
-<% if current_user.username != "1234" %>
-  <span class="notice"><%= flash[:notice] %></span>
-  <%= simple_form_for(resource, :url => update_password_path, :html => { :method => :put }) do |f| %>
-    <%= f.input :current_password, as: :password, input_html: {autocomplete: "off", class: "wenben4"} %>
-    <%= f.input :password, as: :password, label: "新密码", input_html: {autocomplete: "off", class: "wenben4"} %>
-    <%= f.input :password_confirmation, as: :password, input_html: {autocomplete: "off", class: "wenben4"} %>
-    <div>
-      <%= f.submit "确认", class: "btn-primary" %>
-    </div>
-  <% end %>
+<div class="row-fluid">
+  <div class="span9 offset3">
 
-<% else %>
-  您目前登录的是测试账户，所以无法修改密码
-<% end %>
+    <% if current_user.username != "1234" %>
+      <span class="notice"><%= flash[:notice] %></span>
+      <%= simple_form_for(resource, :url => update_password_path, :html => { :method => :put }) do |f| %>
+        <%= f.input :current_password, as: :password, input_html: {autocomplete: "off", class: "wenben4"} %>
+        <%= f.input :password, as: :password, label: "新密码", input_html: {autocomplete: "off", class: "wenben4"} %>
+        <%= f.input :password_confirmation, as: :password, input_html: {autocomplete: "off", class: "wenben4"} %>
+        <div>
+          <%= f.submit "确认", class: "btn-primary" %>
+        </div>
+      <% end %>
+
+    <% else %>
+      您目前登录的是测试账户，所以无法修改密码
+    <% end %>
+
+  </div>
+</div>
 
 
-<script>
-  $(function(){
-    $("#shezhi").addClass("current")
-    $("#bianji_mima").addClass("current")
-  })
-</script>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -1,24 +1,20 @@
 <%= title "编辑用户资料" %>
 
-<%= render "partial/left_navigation" %>
 
-<% if current_user.username != "1234" %>
-  <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: "validate_form"}) do |f| %>
-    <%= f.input :email, readonly: true, input_html: {class: "wenben4"} %>
-    <%= f.input :username, input_html: {class: "validate[required, maxSize[20], ajax[ajaxUserUsername]] wenben4"} %>
-    <%= f.input :current_password, input_html: {class: "wenben4", autocomplete: "off"}, hint: "请输入当前密码来更新账户" %>
-    <div>
-      <%= f.button :submit, "更新", class: "btn-primary" %>
-    </div>
-  <% end %>
-<% else %>
-  您目前登录的是测试账户，所以无法编辑用户信息
-<% end %>
-
-<script>
-  $(function(){
-    $("#shezhi").addClass("current")
-    $("#bianjiyonghu").addClass("current")
-  })
-</script>
+<div class="row-fluid">
+  <div class="span9 offset3">
+    <% if current_user.username != "1234" %>
+      <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: "validate_form"}) do |f| %>
+        <%= f.input :email, readonly: true, input_html: {class: "wenben4"} %>
+        <%= f.input :username, input_html: {class: "validate[required, maxSize[20], ajax[ajaxUserUsername]] wenben4"} %>
+        <%= f.input :current_password, input_html: {class: "wenben4", autocomplete: "off"}, hint: "请输入当前密码来更新账户" %>
+        <div>
+          <%= f.button :submit, "更新", class: "btn-primary" %>
+        </div>
+      <% end %>
+    <% else %>
+      您目前登录的是测试账户，所以无法编辑用户信息
+    <% end %>
 
+  </div>
+</div>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -1,22 +1,16 @@
 <%= title "登陆" %>
 
 
-<div class="row-fluid">
-<div class="span8 offset4">
-  <%= simple_form_for(resource, as: "user", url: session_path(resource_name)) do |f| %>
+<%= simple_form_for(resource, as: "user", url: session_path(resource_name)) do |f| %>
   <div id="notice_error" class="alert">
     <ul>
       <li><%= alert %></li>
     </ul>
   </div>
-<% end %>
   <%= f.input :login, input_html: {class: "wenben1"} %>
   <%= f.input :password, input_html: {class: "wenben1"} %>
   <% if devise_mapping.rememberable? -%>
-    <div>
-      <label for="user_remember_me">记住密码</label>
-      <%= f.check_box :remember_me %>
-    </div>
+    <%= f.input :remember_me, as: :boolean %>
   <% end %>
 
   <div>
@@ -25,16 +19,8 @@
   </div>
 <% end %>
 
-=======
-   <div>
-   <%= f.button :submit, "登陆", class: "btn-primary" %>
-   <input value="试用" type="button" class="btn" id="test_button"/>
-   </div>
-  <% end %>
 
-</div>
-</div>
->>>>>>> 59b804a1cf6981db96a3c37bb5c443a7f3706ace
+
 
 <script>
   $(function(){
@@ -50,6 +36,3 @@
 
 
 
-
-
-
diff --git a/app/views/fenleis/_form.html.erb b/app/views/fenleis/_form.html.erb
@@ -1,7 +1,6 @@
-<%= render "/partial/left_navigation" %>
 
-<div id="right_body">
-  <div id="new_fenlei_tip">
+<div class="row-fluid">
+  <div class="span9 offset3">
     <%= simple_form_for @fenlei, html: {class: "validate_form"} do |f| %>
       <%= f.input :name, input_html: {class: "validate[required, maxSize[20]] wenben4"} %>
       <%= f.input :shouzhi, as: :radio_buttons, collection: Fenlei.get_shouzhi_values %>
@@ -14,9 +13,3 @@
 </div>
 
 
-<script>
-  $(function(){
-    $("#shezhi").addClass("current")
-    $("#fenleiguanli").addClass("current")
-  })
-</script>
diff --git a/app/views/fenleis/index.html.erb b/app/views/fenleis/index.html.erb
@@ -1,44 +1,43 @@
 <% title "类别管理" %>
 
-<%= render "/partial/left_navigation" %>
-
-<div id="right_body">
-<div id="manage_fenlei">
-  <table border="0" cellspacing="0" cellpadding="0">
-    <tr class="table_info_line">
-      <td colspan="4">
-        <span id="info">
-          <% if params[:search].try(:[], :shouzhi_eq) == "zhichu" %>
-            当前为 支出分类,还需要<%= link_to '添加分类', new_fenlei_path %>吗？或者管理<%= link_to "收入分类", fenleis_path(search: {shouzhi_eq: "shouru"}) %>? 
-          <% else %>
-            当前为 收入分类,还需要<%= link_to '添加分类', new_fenlei_path %>吗？或者管理<%= link_to "支出分类", fenleis_path(search: {shouzhi_eq: "zhichu"}) %>? 
-          <% end %>
-        </span>
-      </td>
-    </tr>
-    <tr>
-      <th class="default">默认</th>
-      <th class="name">名称</th>
-      <th class="desc">说明</th>
-      <th class="option">操作</th>
-    </tr>
-    <% @fenleis.each do |fenlei| %>
-    <tr>
-      <td class="default">
-        <%= radio_button_tag "fenlei", fenlei.id, fenlei.position == "1" %>
-      </td>
-      <td class="name">
-        <%= link_to fenlei.name, edit_fenlei_path(fenlei) %>
-      </td>
-      <td class="desc"><%= fenlei.desc %></td>
-      <td class="option">
-        <%= link_to "编辑", edit_fenlei_path(fenlei) %>
-        <%= link_to "删除", fenlei_path(fenlei), method: :delete, confirm: "确定删除吗?" %>
-      </td>
-    </tr>
-  <% end %>
-  </table>
-</div>
+<div class="row-fluid">
+  <div class="span9 offset3">
+
+    <table border="0" cellspacing="0" cellpadding="0">
+      <tr class="table_info_line">
+        <td colspan="4">
+          <span id="info">
+            <% if params[:search].try(:[], :shouzhi_eq) == "zhichu" %>
+              当前为 支出分类,还需要<%= link_to '添加分类', new_fenlei_path %>吗？或者管理<%= link_to "收入分类", fenleis_path(search: {shouzhi_eq: "shouru"}) %>? 
+            <% else %>
+              当前为 收入分类,还需要<%= link_to '添加分类', new_fenlei_path %>吗？或者管理<%= link_to "支出分类", fenleis_path(search: {shouzhi_eq: "zhichu"}) %>? 
+            <% end %>
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <th class="default">默认</th>
+        <th class="name">名称</th>
+        <th class="desc">说明</th>
+        <th class="option">操作</th>
+      </tr>
+      <% @fenleis.each do |fenlei| %>
+        <tr>
+          <td class="default">
+            <%= radio_button_tag "fenlei", fenlei.id, fenlei.position == "1" %>
+          </td>
+          <td class="name">
+            <%= link_to fenlei.name, edit_fenlei_path(fenlei) %>
+          </td>
+          <td class="desc"><%= fenlei.desc %></td>
+          <td class="option">
+            <%= link_to "编辑", edit_fenlei_path(fenlei) %>
+            <%= link_to "删除", fenlei_path(fenlei), method: :delete, confirm: "确定删除吗?" %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
 </div>
 
 
@@ -50,9 +49,6 @@
       $.get("/fenleis/"+fenlei_id+"/set_default")
     })
 
-    $("#shezhi").addClass("current")
-
-    $("#fenleiguanli").addClass("current")
   })
 </script>
 

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
@@ -1,19 +1,18 @@
 <% title "首页" %>
 
-<div id="tongji_bottom_body">
-  <div id="left">
-    <div id="all_zhichu_container"></div>
-  </div>
-  <div id="right">
-    <div id="month_zhichu_container"></div>
+<div class="container-fluid">
+  <div class="row-fluid">
+    <div class="span6">
+      <div id="all_zhichu_container"></div>
+    </div>
+    <div class="span6">
+      <div id="month_zhichu_container"></div>
+    </div>
   </div>
 </div>
 
 
 <script type="text/javascript">
-  $(function(){
-    $("#shouye").addClass("current")
-  })
 
   $(document).ready(function() {
     quanbu_chart_option = {

diff --git a/app/views/partial/_signed_in_header.html.erb b/app/views/partial/_signed_in_header.html.erb
@@ -1,11 +1,22 @@
-<div class="navbar" id="unsigned_navbar">
+<div class="navbar" id="signed_navbar">
   <div class="navbar-inner">
     <div class="container">
       <%= link_to '我的账本', home_path, class: "brand" %>
       <ul class="nav pull-left">
         <li><%= link_to "首页", home_path, id: "shouye" %></li>
         <li><%= link_to "记帐", new_zhangmu_path, id: "jizhang" %></li>
-        <li><%= link_to "设置", edit_user_registration_path, id: "shezhi" %></li>
+        <li class="dropdown">
+        <a data-toggle="dropdown" class="dropdown-toggle" href="#">
+          设置<b class="caret"></b>
+        </a>
+        <ul class="dropdown-menu">
+          <li><%= link_to "账本管理", zhangbens_path, id: "zhangbenguanli" %></li>
+          <li><%= link_to "分类管理", fenleis_path(search: {shouzhi_eq: "zhichu"}), id: "fenleiguanli" %></li>
+          <li><%= link_to "人员管理", peoples_path, id: "renyuanguanli" %></li>
+          <li><%= link_to '编辑用户信息', edit_user_registration_path, id: "bianjiyonghu" %></li>
+          <li><%= link_to '修改密码', bianji_mima_path, id: "bianji_mima" %></li>
+        </ul>
+        </li>
       </ul>
       <ul class="nav pull-right">
         <li><%= link_to "欢迎#{current_user.username}", home_path %></li>

diff --git a/app/views/peoples/_form.html.erb b/app/views/peoples/_form.html.erb
@@ -1,7 +1,6 @@
-<%= render "/partial/left_navigation" %>
 
-<div id="right_body">
-<div id="new_people_tip">
+<div class="row-fluid">
+  <div class="span9 offset3">
   <%= simple_form_for @people, url: path, html: {class: "validate_form"} do |f| %>
     <%= f.input :name, input_html: {class: "validate[required, maxSize[20]] wenben4"} %>
     <%= f.input :desc, input_html: {class: "validate[maxSize[1000]] text1"} %>
@@ -13,12 +12,3 @@
 </div>
 
 
-<script>
-  $(function(){
-
-    $("#shezhi").addClass("current")
-
-    $("#renyuanguanli").addClass("current")
-  })
-</script>
-
diff --git a/app/views/peoples/index.html.erb b/app/views/peoples/index.html.erb
@@ -1,9 +1,8 @@
 <% title "人员管理" %>
 
-<%= render "/partial/left_navigation" %>
 
-<div id="right_body">
-<div id="manage_people">
+<div class="row-fluid">
+  <div class="span9 offset3">
   <table border="0" cellspacing="0" cellpadding="0">
     <tr class="table_info_line">
       <td colspan="4">
@@ -43,8 +42,5 @@
       $.get("/peoples/"+people_id+"/set_default", {id: people_id})
     })
 
-    $("#shezhi").addClass("current")
-
-    $("#renyuanguanli").addClass("current")
   })
 </script>
diff --git a/app/views/zhangbens/_form.html.erb b/app/views/zhangbens/_form.html.erb
@@ -1,20 +1,15 @@
-<%= render "/partial/left_navigation" %>
 
-<div id="right_body">
-  <div id="new_zhangben_tip">
+<div class="row-fluid">
+  <div class="span9 offset3">
     <%= simple_form_for @zhangben, html: {class: "validate_form"} do |f| %>
-      <%= f.input :name, input_html: {class: "validate[required, maxSize[20]] wenben4"} %>
-      <%= f.input :desc, input_html: {class: "validate[maxSize[1000]] text1"} %>
+      <%= f.input :name, input_html: {class: "validate[required, maxSize[20]] wenben4"}, required: true %>
+      <%= f.input :desc, input_html: {class: "validate[maxSize[1000]]"} %>
       <div>
         <%= f.button :submit, "确认", class: "button" %>
       </div>
     <% end %>
   </div>
 </div>
 
-<script>
-  $(function(){
-    $("#shezhi").addClass("current")
-    $("#zhangbenguanli").addClass("current")
-  })
-</script>
+
+