add views

krongk · May 9, 2010 · ac09112 · ac09112
1 parent 5db9d54
commit ac09112
Show file tree

Hide file tree

Showing 8 changed files with 3,658 additions and 27 deletions.
diff --git a/app/views/layouts/_foot_js.html.erb b/app/views/layouts/_foot_js.html.erb
@@ -4,19 +4,7 @@
 %>
 <!-- full skiplink functionality in webkit browsers -->
 <script src="/yaml/core/js/yaml-focusfix.js" type="text/javascript"></script>
-<!-- change city -->
-<script type="text/javascript" src="/javascripts/yui/2.6.0/build/utilities/utilities.js" charset="utf-8"></script>
-<script type="text/javascript" charset="utf-8" src="/javascripts/core.js"></script>
-<script type="text/javascript" charset="utf-8" src="/javascripts/app-deal.js"></script>
-<script type="text/javascript" src="/javascripts/yui/2.6.0/build/container/container-min.js" charset="utf-8"></script>
-<script type="text/javascript">
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
-  })();
-</script>
-<script type="text/javascript" charset="utf-8" src="/javascripts/app-misc.js"></script><script>
-  YAHOO.util.Event.onDOMReady(function(){
-    MT.app.Subscribe.init();});
-</script>
+<!--51.la count-->
+<script language="javascript" type="text/javascript" src="http://js.users.51.la/3739950.js"></script>
+<noscript><a href="http://www.51.la/?3739950" target="_blank"><img alt="&#x6211;&#x8981;&#x5566;&#x514D;&#x8D39;&#x7EDF;&#x8BA1;" src="http://img.users.51.la/3739950.asp" style="border:none" /></a></noscript>
+<!--51.la count-->
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -16,17 +16,16 @@
     <%= javascript_include_tag :fckeditor %>
   </head>
   <body>
-    <div id="admin">
+<div id="admin">
       <% if flash[:notice] %> <div class="warning"><%= flash[:notice] %></div><% end %>
-      <h1>后台管理菜单</h1><div id="menu">
+<h1>后台管理菜单</h1><div id="menu">
 <ul>
   <li><%=link_to "用户注册信息","/admin/users"%></li>
   <li><%=link_to "团品列表","/admin/products"%></li>
   <li><%=link_to "订单列表","/admin/orders"%></li>
   <li><%=link_to "商家留言信息","/admin/sellers"%></li>
   <li><%=link_to "意见反馈列表","/admin/feedbacks"%></li>
   <li><%=link_to "邮件订阅列表","/emails"%></li>
-  <li><a href="#">&nbsp;</a></li>
 </ul></div>
       <%= yield %>
     </div>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -12,6 +12,12 @@
     <![endif]-->
     <%= stylesheet_link_tag 'layout'%>
     <%= javascript_include_tag 'jquery','jquery.validate','jquery.metadata','application' %>
+    <script language="javascript">
+    <% if controller.action_name =="today" -%>
+      //在today页面添加计时器启动方法
+       $(document).ready(function(){ GetRTime(); });
+     <% end  -%>
+     </script>
   </head>
   <body>
     <!-- skip link navigation -->
@@ -29,7 +35,5 @@
     <%=render :partial=>'layouts/footer'%>
 
     <%=render :partial=>'layouts/foot_js'%>
-    <script language="javascript" type="text/javascript" src="http://js.users.51.la/3739950.js"></script>
-    <noscript><a href="http://www.51.la/?3739950" target="_blank"><img alt="&#x6211;&#x8981;&#x5566;&#x514D;&#x8D39;&#x7EDF;&#x8BA1;" src="http://img.users.51.la/3739950.asp" style="border:none" /></a></noscript>
   </body>
 </html>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -6,7 +6,7 @@
 </script>
 <div id="about">
   <%= error_messages_for :user %>
-  <% form_for :user, :url => users_path,:html=>{:id=>"yform",:class=>'yform'} do |f| -%>
+  <% form_for @user,:html=>{:id=>"yform",:class=>'yform'} do |f| -%>
   <%= f.hidden_field :login %><%= f.hidden_field :email%>
   <h2>你好，<%=@user.login%></h2>
   <p>请重新设定您的新密码.</p>

diff --git a/app/views/welcome/today.html.erb b/app/views/welcome/today.html.erb
@@ -115,8 +115,6 @@
   <!-- End: IE Column Clearing -->
 </div>
 <!-- end: #col3 -->
-
-
 <!--计时器-->
 <script language="JavaScript">
   var overDate = <%=(@product.ended_at.to_i+24*60*60)*1000%>;//截止时间
@@ -145,8 +143,5 @@
     }
     setTimeout("GetRTime()",100);
   }
-  $(document).ready(function(){
-    GetRTime();
-  });
 </script>
 
diff --git a/config/routes.rb b/config/routes.rb
@@ -56,6 +56,7 @@
   map.add_to_order '/add_to_order',:controller=>'welcome',:action=>'add_to_order'
   map.forget_password '/account/forget_password',:controller=>'users',:action=>'forget_password'
   map.reset_password '/account/reset_password',:controller=>'users',:action=>'reset_password'
+
   # Install the default routes as the lowest priority.
   # Note: These default routes make all actions in every controller accessible via GET requests. You should
   # consider removing or commenting them out if you're using named routes and resources.

diff --git a/log/development.log b/log/development.log
diff --git a/public/adminffffffffff.html b/public/adminffffffffff.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
+<head> 
+    <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> 
+    <title>要得实惠，上团购三...用四川话说咯</title> 
+    <meta name="keywords"  content="团购三" /> 
+    <meta name="description" content="要得实惠，上团购三！团购三是成都第一个真正意义上的精品生活团购社区！团购三每天只提供一款精品生活产品，涵盖：餐厅、影剧院、酒吧、美发美体、KTV、夜店、户外运动、旅游、体育赛事，音乐会，体育健身等各种消费场所。
+          当网站聚集的人数达到成团数目时，商家、店铺将提供不可思议的超低折扣！" /> 
+    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> 
+  <!--[if lte IE 7]>
+    <link href="/css/patches/patch_equal_heights.css" rel="stylesheet" type="text/css" />
+    <![endif]--> 
+
+  <link href="stylesheets/screen/admin.css" rel="stylesheet" type="text/css" />
+  <link href="stylesheets/layout.css" rel="stylesheet" type="text/css" />
+</head>
+<body> 
+  <div id="admin"> 
+
+<h1>后台管理菜单</h1> 
+<div id="menu">
+<ul> 
+  <li><a href="/admin/users">用户注册信息</a></li> 
+  <li><a href="/admin/products">团品列表</a></li> 
+  <li><a href="/admin/orders">订单列表</a></li> 
+  <li><a href="/admin/sellers">商家留言信息</a></li> 
+  <li><a href="/admin/feedbacks">意见反馈列表</a></li> 
+  <li><a href="/emails">邮件订阅列表</a></li> 
+</ul> 
+</div>
+  <h3>意见反馈列表</h3> 
+<div class="content1"> 
+<table> 
+  <tr> 
+    <th colspan="2">菜单</th> 
+    <th>编号</th> 
+    <th>称呼</th> 
+    <th>联系方式</th> 
+    <th>留言信息</th> 
+    <th>留言时间</th> 
+    <th>是否确认</th> 
+    <th>确认内容</th> 
+  </tr> 
+
+
+  <tr> 
+    <td><a href="/feedbacks/8/edit">修改</a></td> 
+    <td><a href="/feedbacks/8" onclick="if (confirm('Are you sure?')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', 'authenticity_token'); s.setAttribute('value', 'vyIY30MbnFHyMK9Pr1Dq1f31exs9FadqSJfVArwGIyQ='); f.appendChild(s);f.submit(); };return false;">删除</a></td> 
+    <td>8</td> 
+    <td>awef</td> 
+    <td>aaef</td> 
+    <td>aefaef</td> 
+    <td>2010-05-06 15:12</td> 
+    <td>否</td> 
+     <td>否</td> 
+  </tr> 
+  </table>
+    </div> 
+</body> 
+</html>