kitsune 0.1.0 → 0.1.1

data/README.textile

@@ -2,4 +2,15 @@ h1. Kitsune
 
 A drop in Rails CMS
 
-*This is still being developed and is currently barely useable*
+*This is still being developed and is currently barely useable*
+
+
+@$ script/generate kitsune --include-page-model@
+
+@$ rake db:migrate@
+
+@$ script/server@
+
+
+Then go to:
+http://localhost:3000/admin/kitsune

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name = "kitsune"
-  gem_spec.version = "0.1.0"
+  gem_spec.version = "0.1.1"
   gem_spec.summary = "Integrated Rails Content Management System."
   gem_spec.email = "matt@toastyapps.com"
   gem_spec.homepage = "http://github.com/toastyapps/kitsune"

data/app/controllers/admin/kitsune/kitsune_controller.rb

@@ -1,6 +1,72 @@
 class Admin::Kitsune::KitsuneController < Admin::Kitsune::ApplicationController
-  before_filter :load_models
+  before_filter :authenticate,:load_models
   skip_before_filter :verify_authenticity_token
+  
+  helper_method :current_user, :signed_in?, :signed_out?
+  hide_action :current_user, :current_user=, :signed_in?, :signed_out?, :sign_in, :sign_out, :authenticate, :deny_access
+  
+  def current_user
+    @_current_user ||= user_from_cookie
+  end
+  
+  def current_user=(user)
+    @_current_user = user
+  end
+  
+  def signed_in?
+    !current_user.nil?
+  end
+  
+  def sign_in(user)
+    if user
+      user.remember_me!
+      cookies[:remember_token] = {
+        :value => user.remember_token,
+        :expires => 1.year.from_now.utc
+      }
+      current_user = user
+    end
+  end
+  
+  def sign_out
+    cookies.delete(:remember_token)
+    current_user = nil
+  end
+  
+  def signed_out?
+    current_user.nil?
+  end
+  
+  def authenticate
+    if Kitsune.authenticate
+      deny_access unless signed_in?
+    end
+  end
+  
+  def deny_access(flash_message = nil)
+    flash[:notice] = flash_message if flash_message
+    redirect_to url_for(:controller => 'admin/kitsune/sessions', :action => 'new')
+  end
+  
+  def user_from_cookie
+    if token = cookies[:remember_token]
+      KitsuneUser.find_by_remember_token(token)
+    end
+  end
+  
+  def redirect_back_or(default)
+    redirect_to(return_to || default)
+    clear_return_to
+  end
+  
+  def return_to
+    session[:return_to] || params[:return_to]
+  end
+  
+  def clear_return_to
+    session[:return_to] = nil
+  end
+  
   private
   def load_models
     models = Kitsune.models_with_admin.map{ |m| Kitsune::Inspector.new(m) }

data/app/controllers/admin/kitsune/kitsune_users_controller.rb

@@ -0,0 +1,20 @@
+class Admin::Kitsune::KitsuneUsersController < Admin::Kitsune::KitsuneController
+  layout 'admin/kitsune'
+  def index
+    @users = KitsuneUser.paginate(:page => params[:page])
+  end
+  
+  def new
+    @user = KitsuneUser.new
+  end
+  
+  def create
+    @user = KitsuneUser.new(params[:kitsune_user])
+    if @user.save
+      flash[:notice] = "User was created"
+      redirect_to url_for(:controller => 'admin/kitsune/kitsune_users', :action => 'index')
+    else
+      render 'new'
+    end
+  end
+end

data/app/controllers/admin/kitsune/sessions_controller.rb

@@ -0,0 +1,23 @@
+class Admin::Kitsune::SessionsController < Admin::Kitsune::KitsuneController
+  skip_before_filter :authenticate, :load_models
+  layout 'admin/kitsune'
+  def new
+    
+  end
+  
+  def create
+    @user = KitsuneUser.authenticate(params[:session][:email], params[:session][:password])
+    if @user.nil?
+      flash[:notice] = "Could not log you in"
+      render 'new'
+    else
+      sign_in(@user)
+      redirect_back_or(url_for(:controller => 'admin/kitsune/models'))
+    end
+  end
+  
+  def destroy
+    sign_out
+    redirect_to(url_for(:controller => 'admin/kitsune/models'))
+  end
+end

data/app/helpers/admin/kitsune/records_helper.rb

@@ -31,4 +31,9 @@ module Admin::Kitsune::RecordsHelper
 			"<p><strong>Current File</strong>: " + image_tag(file.to_s) + "</p>"
 		end
 	end
+	
+	def kitsune_title
+	  " - #{@model.admin_name}" + " : #{params[:action].titleize}"
+	end
+	
 end

data/app/views/admin/kitsune/kitsune_users/index.html.haml

@@ -0,0 +1,19 @@
+#kitsune_record_header
+  %h2.legend Users
+  #menu= link_to "New user", :controller => 'admin/kitsune/kitsune_users', :action => :new
+
+%table
+  %thead
+    %tr
+      %th Email
+      %th Actions
+  %tbody
+    - @users.each do |user|
+      %tr{:class=>cycle('odd', 'even')}
+        %td= user.email
+        %td
+          = link_to 'Edit', "#"
+          \-
+          = link_to 'Delete', '#'
+- if defined? will_paginate
+  = will_paginate @users

data/app/views/admin/kitsune/kitsune_users/new.html.haml

@@ -0,0 +1,19 @@
+#kitsune_record_header
+  %h2.legend New User
+  #menu.with_form
+    = link_to 'Back', :controller => 'admin/kitsune/kitsune_users'
+
+- form_for([:admin, :kitsune, @user]) do |form|
+  %fieldset
+    = form.error_messages
+    .field
+      = form.label :email
+      = form.text_field :email
+    .field
+      = form.label :password
+      = form.password_field :password
+    .field
+      = form.label :password_confirmation
+      = form.password_field :password_confirmation
+    .submit_button
+      %button(value="Save" type='submit' class="submitBtn") <span>Save</span>

data/app/views/admin/kitsune/models/index.html.haml

@@ -1,2 +1 @@
-%p Use the left menu to manage your site. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-
+%p Use the left menu to manage your site.

data/app/views/admin/kitsune/records/_form.html.haml

@@ -25,4 +25,3 @@
           = hidden_field_tag :redirect_id, params[column.name]
     .submit_button
       %button(value="Save" type='submit' class="submitBtn") <span>Save</span>
-= yield :below_form

data/app/views/admin/kitsune/records/index.html.haml

@@ -1,3 +1,5 @@
+- #@kitsune_title = @model.admin_name
+
 #kitsune_record_header
   %h2.legend= @model.admin_name
   - unless @model.disabled?(:new)

data/app/views/admin/kitsune/sessions/new.html.haml

@@ -0,0 +1,12 @@
+#kitsune_record_header
+  %h2.legend Sign in
+- form_for :session, :url => admin_kitsune_session_path do |form|
+  %fieldset
+    .field
+      = form.label :email
+      = form.text_field :email
+    .field
+      = form.label :password
+      = form.password_field :password
+    .submit_button
+      %input(value="Sign in" type='submit' class="submitBtn")

data/app/views/layouts/admin/kitsune.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html lang='en' xml:lang='en' xmlns='http://www.w3.org/1999/xhtml'>
 	<head>
-		<title>Kitsune CMS</title>
+		<title>Kitsune CMS <%= kitsune_title rescue "" %></title>
     <%= javascript_include_tag 'kitsune/jquery.js', 'kitsune/kitsune_jquery.js', 'kitsune/upload_maker.js' %>
 		<%= stylesheet_link_tag 'kitsune/global.css' %>
 		<!--[if IE]>
@@ -11,13 +11,13 @@
 		<script type='text/javascript'>
 			tinyMCE.init({
 				plugins: "iespell",
-				theme: "advanced",
+				theme: "kitsune",
 				width: "650px",
 				height: "500px",
-				theme_advanced_buttons1 : "bold,italic,strikethrough,|,bullist,numlist,|,outdent,indent,|,image,link,unlink,|,code",
-				theme_advanced_buttons2 : "",
-				theme_advanced_buttons3 : "",
-				theme_advanced_toolbar_location : "top",
+				theme_kitsune_buttons1 : "bold,italic,strikethrough,|,bullist,numlist,|,outdent,indent,|,image,link,unlink,|,code",
+				theme_kitsune_buttons2 : "",
+				theme_kitsune_buttons3 : "",
+				theme_kitsune_toolbar_location : "top",
 				convert_urls : false
 			});
 		</script>
@@ -27,6 +27,9 @@
 		<div id='content'>
 			<div id='header'>
 				<h1><%= link_to 'Kitsune CMS', :controller => 'admin/kitsune/models' %></h1>
+				<% if Kitsune.authenticate && signed_in? %>
+					<%= link_to 'Sign out', url_for(:controller => 'admin/kitsune/sessions', :action => 'destroy'), :method => :delete, :class => 'sign_out' %>
+				<% end %>
 				<a href='/' class='view'>View Site</a>
 			</div>
 			<%= render "admin/kitsune/shared/flashes" %>
@@ -36,25 +39,27 @@
 						<%= yield %>
 					</div>
 				</div>
-				<div class='kitsune_left'>
-          <div class='wrapper'>
-            <ul>
-					  <% @models.each do |model| %>
-  						<% if model.is_a? Hash %>
-  							<% model.each do |key, value| %>
-  								<li class='kitsune_category'><%= key %>
-  									<% value.each do |inner_model| %>
-  										<li class='kitsune_inner_model_link'><%= link_to inner_model.admin_name, :controller => 'admin/kitsune/records', :model_id => inner_model.object_class %></li>
-  									<% end %>
-  								</li>
-  							<% end %>
-  						<% else %>
-  							<li class='kitsune_model_link'><%= link_to model.admin_name, :controller => 'admin/kitsune/records', :model_id => model.object_class %></li>
-  						<% end %>
-  					<% end %>
-  					</ul>
+				<% if @models %>
+					<div class='kitsune_left'>
+	          <div class='wrapper'>
+	            <ul>
+						  <% @models.each do |model| %>
+	  						<% if model.is_a? Hash %>
+	  							<% model.each do |key, value| %>
+	  								<li class='kitsune_category'><%= key %>
+	  									<% value.each do |inner_model| %>
+	  										<li class='kitsune_inner_model_link'><%= link_to inner_model.admin_name, :controller => 'admin/kitsune/records', :model_id => inner_model.object_class %></li>
+	  									<% end %>
+	  								</li>
+	  							<% end %>
+	  						<% else %>
+	  							<li class='kitsune_model_link'><%= link_to model.admin_name, :controller => 'admin/kitsune/records', :model_id => model.object_class %></li>
+	  						<% end %>
+	  					<% end %>
+	  					</ul>
+						</div>
 					</div>
-				</div>
+				<% end %>
 			</div>
 		</div>
 	</body>

data/config/kitsune_routes.rb

@@ -2,6 +2,8 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/admin/kitsune', :controller => 'admin/kitsune/models'
   map.namespace :admin do |admin|
     admin.namespace :kitsune do |kitsune|
+      kitsune.resource :session
+      kitsune.resources :kitsune_users, :as => :users
       kitsune.resources :pages
       kitsune.resources :models do |model|
 				model.resources :records

data/generators/kitsune/kitsune_generator.rb

@@ -3,14 +3,14 @@ class KitsuneGenerator < Rails::Generator::Base
   
   def initialize(runtime_args, runtime_options = {})
     @versioned = runtime_args.delete("--versioned")
-    @include_pages = runtime_args.delete("--include-page-model")
-    @include_users = runtime_args.delete("--include-user-model")
+    @dont_include_pages = runtime_args.delete("--without-page")
+    @dont_include_users = runtime_args.delete("--without-user")
     super
   end
   
   def manifest
     record do |m|
-      if !!@include_pages
+      unless !!@dont_include_pages
         page_model = "app/models/page.rb"
         if File.exists?(page_model)
           m.insert_into page_model, "include Kitsune::Page"
@@ -21,6 +21,10 @@ class KitsuneGenerator < Rails::Generator::Base
         end
       end
       
+      unless !!@dont_include_users
+        m.migration_template "migrations/create_kitsune_users.rb", 'db/migrate', :migration_file_name => "kitsune_create_kitsune_users"
+      end
+      
       if !!@versioned
         Rails::Generator::Scripts::Generate.new.run(['vestal_versions_migration'])
       end

data/generators/kitsune/templates/javascripts/tiny_mce/themes/kitsune/about.htm

@@ -0,0 +1,56 @@
+<!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">
+<head>
+	<title>{#advanced_dlg.about_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="js/about.js"></script>
+</head>
+<body id="about" style="display: none">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>
+				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>
+				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<h3>{#advanced_dlg.about_title}</h3>
+				<p>Version: <span id="version"></span> (<span id="date"></span>)</p>
+				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
+				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
+				<p>Copyright &copy; 2003-2008, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
+				<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>
+
+				<div id="buttoncontainer">
+					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>
+					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>
+					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>
+				</div>
+			</div>
+
+			<div id="plugins_panel" class="panel">
+				<div id="pluginscontainer">
+					<h3>{#advanced_dlg.about_loaded}</h3>
+
+					<div id="plugintablecontainer">
+					</div>
+
+					<p>&nbsp;</p>
+				</div>
+			</div>
+
+			<div id="help_panel" class="panel noscroll" style="overflow: visible;">
+				<div id="iframecontainer"></div>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+</body>
+</html>

data/generators/kitsune/templates/javascripts/tiny_mce/themes/kitsune/anchor.htm

@@ -0,0 +1,31 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.anchor_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/anchor.js"></script>
+</head>
+<body style="display: none">
+<form onsubmit="AnchorDialog.update();return false;" action="#">
+	<table border="0" cellpadding="4" cellspacing="0">
+		<tr>
+			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>
+		</tr>
+		<tr>
+			<td class="nowrap">{#advanced_dlg.anchor_name}:</td>
+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>
+		</tr>
+	</table>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>

data/generators/kitsune/templates/javascripts/tiny_mce/themes/kitsune/charmap.htm

@@ -0,0 +1,53 @@
+<!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">
+<head>
+	<title>{#advanced_dlg.charmap_title}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/charmap.js"></script>
+</head>
+<body id="charmap" style="display:none">
+<table align="center" border="0" cellspacing="0" cellpadding="2">
+    <tr>
+        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>
+    </tr>
+    <tr>
+        <td id="charmapView" rowspan="2" align="left" valign="top">
+			<!-- Chars will be rendered here -->
+        </td>
+        <td width="100" align="center" valign="top">
+            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">
+                <tr>
+                    <td id="codeV">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td id="codeN">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td valign="bottom" style="padding-bottom: 3px;">
+            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 1px;">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>