uzuuzu-cms 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/uzuuzu-cms.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 
 require 'uzuuzu'
+require 'uzuuzu-cms/wrapper/uzuuzu'
 require 'uzuuzu-cms/wrapper/model'
+require 'uzuuzu-cms/wrapper/helper'
 require 'uzuuzu-cms/wrapper/controller'
 require 'uzuuzu-cms/wrapper/environments'

data/lib/uzuuzu-cms/controller/admin/view/index.rhtml

@@ -0,0 +1,35 @@
+
+<div class="admin_navigator">
+	<a class="admin_panel_button">
+	</a>
+	<a class="admin_edit_button">
+	</a>
+</div>
+	
+<div class="admin_panel">
+	<div class="tab_navigator">
+		<div class="">
+		</div>
+		<div class="">
+		</div>
+		<div class="">
+		</div>
+		<div class="">
+		</div>
+		<div class="">
+		</div>
+	</div>
+</div>
+
+<div class="admin_edit_panel">
+</div>
+<div class="admin_file_panel">
+</div>
+<div class="admin_image_panel">
+</div>
+<div class="admin_movie_panel">
+</div>
+<div class="admin_contents_panel">	
+</div>
+
+

data/lib/uzuuzu-cms/controller/contents.rb

@@ -8,8 +8,12 @@ module UzuUzu
         redirect(rf(Initialize)) unless info.initialize?
       end
 
-      def index
-        ''
+      def index(id)
+        contents = ::UzuUzu::Contents.first(:id => id)
+        if contents.nil?
+          not_found
+        end
+        respond(contents.render(self))
       end
     end # Contents
   end # Controller

data/lib/uzuuzu-cms/controller/error.rb

@@ -0,0 +1,11 @@
+# coding: utf-8
+
+module UzuUzu
+  module Controller
+    class Error
+      def index(code)
+        respond(render_page(info, render_file(__DIR__("view/error/#{code}.rhtml"))))
+      end
+    end
+  end
+end

data/lib/uzuuzu-cms/controller/index.rb

@@ -9,15 +9,6 @@ module UzuUzu
         respond(render_full(Page, :top_page))
       end
       
-      def error(code)
-        @contents = render_file(__DIR__("view/error/#{code}.rhtml"))
-        if info.initialize?
-          @resource = info
-        end
-        @contents = render_file(__DIR__("view/layout.rhtml"))
-        respond(@contents)
-      end
-      
       def css(id)
         UzuUzu::repository do
           @resource = Css.first(:id => id)

data/lib/uzuuzu-cms/controller/initialize.rb

@@ -4,109 +4,44 @@ module UzuUzu
   module Controller
     class Initialize
       def index
-        if Info.first.nil?
-          # fixture load
-          logger.debug 'fixture load start'
-          Dir.glob('./fixture/**/*.*').each do |path|
-            logger.debug "fixture file : #{path}"
-            paths = path.split('/')
-            model_name = ::File.basename(paths.pop, '.*')
-            while !paths.blank? && paths[-1] != 'fixture'
-              model_name = "#{paths.pop.camel_case}::#{model_name.camel_case}"
-            end
-            begin
-              logger.debug "fixture model name : #{model_name}"
-              model = eval("::#{model_name}")
-              ::UzuUzu::DataStore::Fixture.import_file(model, path, true)
-            rescue NameError => e
-              logger.error(e.to_s)
-            end
-          end
-          logger.debug 'fixture load end'
-        end
-        if info.initialize?
-          redirect rf(UzuUzu::Controller::Index)
-        end
         self.send("step#{info.step}")
         case(info.step)
         when 1
-          respond(info.render(self, render_file(__DIR__('view/initialize/step1.rhtml'))))
+          respond(render_page(info, render_file(__DIR__('view/initialize/step1.rhtml'))))
         when 2
-          respond(info.render(self, render_file(__DIR__('view/initialize/step2.rhtml'))))
-        when 3
-          respond(info.render(self, render_file(__DIR__('view/initialize/step3.rhtml'))))
-        when 4
-          redirect rf(UzuUzu::Controller::Index)
+          respond(render_page(info, render_file(__DIR__('view/initialize/step2.rhtml'))))
         end
-      end
+      end # index
 
       private
 
       def step1
-        unless session[:openid_identity].nil?
-          UzuUzu.transaction do |tr|
-            tr.begin
-            info.step = 2
-            info.save
-            tr.commit
-          end
-        end
-      end
-
-      def step2
         if session[:openid_identity].nil?
-          UzuUzu.transaction do |tr|
-            tr.begin
-            info.step = 1
-            info.save
-            tr.commit
-          end
           return
         end
-        if request.post?
-          if request.params['name'].blank?
-            @error = fix_localize(:user_name_empty)
-            return
-          end
-          UzuUzu.transaction do |tr|
-            tr.begin
-            user = UzuUzu::User.new
-            user.user_id = session[:openid_identity]
-            user.domain = session[:openid_domain]
-            user.name = request.params['name']
-            user.email = request.params['email']
-            user.web = request.params['web']
-            info.step = 3
-            info.admin = user
-            if info.save
-              tr.commit
-            else
-              tr.roolback
-            end
-          end
-        end
-      end
-
-      def step3
-        if session[:openid_identity].nil?
-          UzuUzu.transaction do |tr|
-            tr.begin
-            info.step = 1
-            info.save
+        UzuUzu.transaction do |tr|
+          tr.begin
+          info.step = 2
+          user = UzuUzu::User.new
+          user.user_id = session[:openid_identity]
+          user.domain = session[:openid_domain]
+          user.name = 'admin'
+          user.admin = true
+          if info.save
             tr.commit
+          else
+            tr.rollback
           end
-          return
         end
-        if request.post?
-           UzuUzu.transaction do |tr|
-            tr.begin
-            info.step = 4
-            info.title = request.params['title']
-            info.save
-            tr.commit
-          end
+      end # step1
+      
+      def step2
+        if session[:openid_identity].nil?
+          redirect rf(::UzuUzu::Controller::Index)
         end
-      end
+        login_user = ::UzuUzu::User.first(:user_id => session[:openid_identity])
+        login_user
+      end # step2
     end # Initialize
   end # Controller
 end # UzuUzu

data/lib/uzuuzu-cms/controller/openid.rb

@@ -22,7 +22,7 @@ module UzuUzu
           redirect referer || rf(Index)
         end
         session[:referer] = request.referrer
-        respond(info.render(render_file(__DIR__('view/openid/index.rhtml'))))
+        respond(render_page(info, render_file(__DIR__('view/openid/index.rhtml'))))
       end
 
       def logout

data/lib/uzuuzu-cms/controller/page.rb

@@ -2,19 +2,56 @@
 
 module UzuUzu
   module Controller
+    #
+    #
+    #
     class Page
       
+      #
+      #
+      #
       def before
         redirect(rf(Initialize)) unless info.initialize?
-      end
+      end # before
       
-      def index(page, *args)
-        
-      end
+      #
+      #
+      #
+      def index(*breadcrumbs)
+        if breadcrumbs.blank?
+          not_found
+        end
+        page = ::UzuUzu::Page.first(:name => breadcrumbs.shift)
+        while !breadcrumbs.blank?
+          page = page.childs(:name => breadcrumbs.shift) unless page.nil?
+        end
+        if page.nil?
+          not_found
+        end
+        respond(page.render(self))
+      end # index
+      
+      #
+      #
+      #
+      def id(page_id)
+        page = ::UzuUzu::Page.first(:id => page_id)
+        if page.nil?
+          not_found
+        end
+        respond(render_page(page))
+      end # id
 
+      #
+      #
+      #
       def top_page
-        ""
-      end
+        page = info.top_page
+        if page.nil?
+          not_found
+        end
+        respond(render_page(page))
+      end # top_page
     end # Page
   end # Controller
 end # UzuUzu

data/lib/uzuuzu-cms/controller/user.rb

@@ -19,8 +19,7 @@ module UzuUzu
             end
           end
         end
-        view_value = render_file(__DIR__("view/user/entry.xhtml"))
-        respond(view_value)
+        respond(render_page(info, render_file(__DIR__('view/user/entry.rhtml'))))
       end
     end # User
   end # Controller

data/lib/uzuuzu-cms/controller/view/crud/destroy.rhtml

@@ -7,8 +7,8 @@
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="expires" content="-1" />
-		<%= css 'jquery.mobile' %>
-		<%= js_for 'jquery', 'jquery.mobile' %>
+		<%= css '/css/jquery.mobile.css' %>
+		<%= js_for '/js/jquery.js', '/js/jquery.mobile.js' %>
 		</head>
 	<body >
 		<div data-role="page" id="confirm">

data/lib/uzuuzu-cms/controller/view/crud/edit.rhtml

@@ -7,8 +7,8 @@
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="expires" content="-1" />
-		<%= css 'jquery.mobile' %>
-		<%= js_for 'jquery', 'jquery.mobile' %>
+		<%= css '/css/jquery.mobile.css' %>
+		<%= js_for '/js/jquery.js', '/js/jquery.mobile.js' %>
 	</head>
 	<body >
 		<div data-role="page" id="top">

data/lib/uzuuzu-cms/controller/view/crud/index.rhtml

@@ -7,8 +7,8 @@
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="expires" content="-1" />
-		<%= css 'jquery.mobile' %>
-		<%= js_for 'jquery', 'jquery.mobile' %>
+		<%= css '/css/jquery.mobile.css' %>
+		<%= js_for '/js/jquery.js', '/js/jquery.mobile.js' %>
 	</head>
 	<body>
 		<div data-role="page" id="top">

data/lib/uzuuzu-cms/controller/view/crud/new.rhtml

@@ -7,8 +7,8 @@
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="expires" content="-1" />
-		<%= css 'jquery.mobile' %>
-		<%= js_for 'jquery', 'jquery.mobile' %>
+		<%= css '/css/jquery.mobile.css' %>
+		<%= js_for '/js/jquery.js', '/js/jquery.mobile.js' %>
 	</head>
 	<body >
 		<div data-role="page" id="top">

data/lib/uzuuzu-cms/controller/view/crud/show.rhtml

@@ -7,8 +7,8 @@
 		<meta http-equiv="Content-Style-Type" content="text/css" />
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta http-equiv="expires" content="0" />
-		<%= css 'jquery.mobile' %>
-		<%= js_for 'jquery', 'jquery.mobile' %>
+		<%= css '/css/jquery.mobile.css' %>
+		<%= js_for '/js/jquery.js', '/js/jquery.mobile.js' %>
 		</head>
 	<body >
 		<div data-role="page" id="top">

data/lib/uzuuzu-cms/controller/view/error/404.rhtml

@@ -1,2 +1,2 @@
 
-<%= fix_localize(:not_found) %>
+<%= localize(:not_found) %>

data/lib/uzuuzu-cms/controller/view/error/500.rhtml

@@ -1,2 +1,2 @@
 
-<%= fix_localize(:server_error) %>
+<%= localize(:server_error) %>

data/lib/uzuuzu-cms/controller/view/initialize/step1.rhtml

@@ -1,15 +1,17 @@
 
 <div id="step1">
 	<p>
-		<%= fix_localize(:step1) %>
+		<%= localize(:step1) %>
+	</p>
+	<br />
+	<p>
+		<%= localize(:openid_message) %>
 	</p>
 	<form method="post" action="<%= rf(UzuUzu::Controller::Openid, :openid_begin) %>">
 		<p>
-			<%= fix_localize(:openid_url) %>：
+			<%= localize(:openid_url) %>：
 			<input type="text" name="url" />
-		</p>
-		<p>
-			<input type="submit" value="<%= fix_localize(:login) %>"/>
+			<input type="submit" value="<%= localize(:login) %>"/>
 		</p>
 	</form>
 </div>

data/lib/uzuuzu-cms/controller/view/initialize/step2.rhtml

@@ -1,24 +1,11 @@
 
 <div id="step2">
 	<p>
-		<%= fix_localize(:step2) %>
+		<%= localize(:step2) %>
+	</p>
+	<p>
+		<a href="<%= rf(::UzuUzu::Controller::Admin::Index) %>"><%= localize(:to_admin_page) %></a>
+		&nbsp;
+		<a href="<%= rf(::UzuUzu::Controller::Index) %>"><%= localize(:to_top_page) %></a>
 	</p>
-	<form method="post">
-		<p class='error_detail'><%= @error %></p>
-		<p>
-			<%= fix_localize(:user_entry_name) %>：
-			<input type="text" name="name" />
-		</p>
-		<p>
-			<%= fix_localize(:user_entry_email) %>：
-			<input type="text" name="email" />
-		</p>
-		<p>
-			<%= fix_localize(:user_entry_web) %>：
-			<input type="text" name="web" />
-		</p>
-		<p>
-			<input type="submit" value="<%= fix_localize(:entry) %>"/>
-		</p>
-	</form>
 </div>

data/lib/uzuuzu-cms/controller/view/openid/index.rhtml

@@ -1,14 +1,14 @@
 <div id="openid_index">
 	<p>
-		<%= fix_localize(:openid_message) %>
+		<%= localize(:openid_message) %>
 	</p>
 	<form method="post" action="<%= r(:openid_begin) %>">
 		<p>
-			<%= fix_localize(:openid_url) %>：
+			<%= localize(:openid_url) %>：
 			<input type="text" name="url" />
 		</p>
 		<p>
-			<input type="submit" value="<%= fix_localize(:login) %>"/>
+			<input type="submit" value="<%= localize(:login) %>"/>
 		</p>
 	</form>
 </div>