整改layouts/xxbar到entries,导航栏半成品,不能用

git-svn-id: http://glupx.googlecode.com/svn/trunk/Reliz@79 189f022a-1064-8ae2-3e6f-c4a67275c50b

app/models/navigation.rb

+class Navigation < ActiveRecord::Base
+  
+end

app/themes/lotus/boards/index.html.erb

@@ -34,7 +34,7 @@
 <div class="ui-dialog-titlebar ui-widget-header ui-corner-all">
   <table width="100%"  height="27px"border="0" cellspacing="0" cellpadding="0" >
     <tr>
-      <td  width="590px"style="padding-left:5px"><%= render 'layouts/onlineuserbar' %> </td>
+      <td  width="590px"style="padding-left:5px"><%= render 'entries/onlineuser' %> </td>
       <td width="590px" style="padding-right:5px" align="right">-</td>
     </tr>
   </table></div>

app/themes/lotus/layouts/_top.html.erb

@@ -3,7 +3,7 @@
     <style type="text/css">
     #userbar{margin-left: 900px;}
     </style>
-    <%= render 'layouts/userbar' %>
+    <%= render 'entries/user' %>
   </div>
   <div id="h3" style="background-image:url(<%= image_path 'common/banner.jpg' %>);background-repeat:no-repeat; background-position:right;">
     <div id="logo" style=" color:#FFFFFF; width:800px; height:113px; float:left;">
@@ -16,8 +16,8 @@
   <div class=" box ui-widget-content ui-corner-all ui-helper-clearfix" >
     <div id="h4" class="ui-dialog-titlebar ui-widget-header ui-corner-all"><table  border="0" cellspacing="0" cellpadding="0" id="tb1">
         <tr>
-          <%= render "layouts/navibar" %>
-        <div style="float: right;"><%= render "layouts/searchbar" %></div>
+          <%= render "entries/navigation" %>
+        <div style="float: right;"><%= render "entries/search" %></div>
         </tr>
       </table></div>
     <div id="h5" >
@@ -40,10 +40,10 @@
     <div id="h6">
       <table width="100%" border="0" cellspacing="0" cellpadding="0" id="tb3">
         <tr>
-          <td  width="600"style="padding-left:15px"><%= render 'layouts/actionbar' %></td>
+          <td  width="600"style="padding-left:15px"><%= render 'entries/action' %></td>
           <td width="600"align="right" style="padding-right:20px">
             <select name="effects" id="effectTypes" style="visibility:hidden"><option value="fade">Drop</option></select>
-            <div style="float: right;"><%= render 'layouts/themebar' %></div>
+            <div style="float: right;"><%= render 'entries/theme' %></div>
           </td>
         </tr>
       </table>

app/views/boards/index.html.erb

@@ -29,7 +29,7 @@
     <span class="headactions"><a href="index.php?showoldetails=yes#online" class="nobdr"><%= image_tag 'common/collapsed_yes.gif' %></a></span>
 
     <h3>
-      <%= render 'layouts/onlineuserbar' %>
+      <%= render 'entries/onlineuser' %>
     </h3>
   </div>
 </div>

app/views/boards/show.html.erb

@@ -17,7 +17,7 @@
 
 
 <div class="pages_btns s_clear">
-<%= render 'layouts/pages', :count => @board.topics.count %>
+<%= render 'entries/page', :count => @board.topics.count %>
 <span id="visitedboards" onmouseover="$('visitedboards').id = 'visitedboardstmp';this.id = 'visitedboards';showMenu({'ctrlid':this.id})" class="pageback"><a href="index.php">返回首页</a></span>
 
 <span class="postbtn" id="newspecial" prompt="post_newthread"><%= link_to t('topic.new'), new_topic_path(:board_id => @board.id) %></span>
@@ -97,7 +97,7 @@
 </form>
 </div>
 <div class="pages_btns s_clear">
-<%= render 'layouts/pages', :count => @board.topics.count %>
+<%= render 'entries/page', :count => @board.topics.count %>
 <span id="visitedboards" onmouseover="$('visitedboards').id = 'visitedboardstmp';this.id = 'visitedboards';showMenu({'ctrlid':this.id})" class="pageback"><a href="index.php">返回首页</a></span>
 <span class="postbtn" id="newspecialtmp" ><%= link_to t('topic.new'), new_topic_path(:board_id => @board.id) %></span>
 

app/views/layouts/_actionbar.html.erb → app/views/entries/_action.html.erb

-<div id="actionbar">
+<div id="action">
 <%= @site %>
 <% @actions.each do |action| %>
    &raquo; <%= action %>

app/views/entries/_navigation.html.erb

+<div id="navigation">
+  <ul>
+    <li class="menu_1"><%=link_to t('navi.forum'), :"boards", :hidefocus => true, :id => :mn_index %></li>
+    <li class="menu_1"><%=link_to t('navi.forum'), :controller => :boards, :action => :index, :hidefocus => true, :id => :mn_index %></li>
+  </ul>
+</div>
\ No newline at end of file

app/views/layouts/_themebar.html.erb → app/views/entries/_theme.html.erb

 <% unless @site.themes.empty? %>
-  <div id ="themebar">
+  <div id ="theme">
     <ul>
       <% @site.themes.each_pair do |name, theme| %>
         <li><%= link_to name, theme_path(name), :title => name %></li>

app/views/layouts/_userbar.html.erb → app/views/entries/_user.html.erb

-<div id="userbar">
+<div id="user">
   <% if logged? %>
     <cite><a href="space.php?uid=359" class="noborder"><%= @correct_user %> </a></cite>
     <span class="pipe">|</span>

app/views/entries/_welcome.html.erb

+<div id="welcome">
+  <% if logged? %>
+    <%=t 'forum.welcom' %> <%= @corrent_user %> ,  <%= link_to t('forum.mypost'), @corrent_user %> <%= link_to t('forum.newpost'), @corrent_user %>
+  <% else %>  
+    你可以<%= link_to t('user.register'), new_user_path %>一个帐号，并以此<%= link_to t('user.login'), login_user_path %> ，以浏览更多精彩内容，并随时发布观点，与大家交流。
+  <% end %>
+</div>
+
+

app/views/layouts/_navibar.html.erb

-<ul>
-<li class="menu_1"><%=link_to t('navi.forum'), :root, :hidefocus => true, :id => :mn_index %></li>
-</ul>
-  
-  
-  
-<!--<script type="text/javascript">
-var currentMenu = $('mn_index') ? $('mn_index') : $('mn_index');
-currentMenu.parentNode.className = 'current';
-</script>-->
\ No newline at end of file

app/views/layouts/_top.html.erb

@@ -2,9 +2,9 @@
 <div id="topbar" name="TOP">
   <div class="topanel">
     <div id="memberp">
-      <%= render 'layouts/userbar' %>
+      <%= render 'entries/user' %>
     </div>
-    <%= render 'layouts/searchbar' %>
+    <%= render 'entries/search' %>
   </div>
 </div>
 <div id="headerbg">
@@ -17,10 +17,10 @@
     <div class="bg-dmenuleft"></div>
     <div class="bg-dmenu" style="position: relative;">
       <div id="menu">
-        <%= render "layouts/navibar" %>
+        <%= render "entries/navigation" %>
       </div>
       <div id="style_switch">
-        <%= render 'layouts/themebar' %>
+        <%= render 'entries/theme' %>
       </div>
 
     </div>
@@ -35,6 +35,6 @@
 </div>
 
 <div id="nav">
-  <%= render 'layouts/actionbar' %>
+  <%= render 'entries/action' %>
 </div>
 <div id="ad_text"></div>
\ No newline at end of file

db/migrate/20111042772026_create_navigations.rb

+class CreateNavigations < ActiveRecord::Migration
+  def self.up
+    create_table :navigations do |t|
+      t.string :name
+      t.string :url
+      t.integer :displayorder
+      t.references :usergroup
+      t.references :super
+      #t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :navigations
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111042772025) do
+ActiveRecord::Schema.define(:version => 20111042772026) do
 
   create_table "boards", :force => true do |t|
     t.string   "name",          :default => "", :null => false
@@ -55,6 +55,14 @@ ActiveRecord::Schema.define(:version => 20111042772025) do
     t.datetime "updated_at"
   end
 
+  create_table "navigations", :force => true do |t|
+    t.string  "name"
+    t.string  "url"
+    t.integer "displayorder"
+    t.integer "usergroup_id"
+    t.integer "super_id"
+  end
+
   create_table "notices", :force => true do |t|
     t.integer  "user_id"
     t.string   "type"

test/fixtures/navigations.yml

+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+#  column: value

test/unit/navigation_test.rb

+require 'test_helper'
+
+class NavigationTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end