ActionItem152: adding a login block

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1241 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem152: adding a login block
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1241 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent f037e407
Showing 25 changed files with 182 additions and 36 deletions Show diff stats
app/controllers/admin/environment_design_controller.rb
app/controllers/box_organizer_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/account_controller.rb
app/helpers/application_helper.rb
app/helpers/boxes_helper.rb
app/models/block.rb
app/models/login_block.rb
app/models/main_block.rb
app/views/account/login_block.rhtml
app/views/account/user_info.rhtml
app/views/environment_design
app/views/home/index.rhtml
app/views/layouts/application.rhtml
app/views/layouts/block.rhtml
public/designs/icons/default/README
public/designs/icons/default/password.png
public/designs/icons/default/style.css
public/stylesheets/block.css
public/stylesheets/blocks.css
@@ -0,0 +1,7 @@
+class EnvironmentDesignController < BoxOrganizerController
+  
+  def available_blocks
+    @available_blocks ||= [ LoginBlock ]
+  end
+
+end
 class BoxOrganizerController < ApplicationController
+  def index
+  end
+
   def move_block
     @block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
@@ -6,8 +6,4 @@ class ProfileDesignController &lt; BoxOrganizerController
     @available_blocks ||= [ Block, ArticleBlock ]
   end
-  def index
-  end
-
-
 end
@@ -34,6 +34,14 @@ class AccountController &lt; PublicController
     render :action => 'login', :layout => false
   end
+  def login_block
+    if logged_in?
+      render :action => 'user_info', :layout => 'block'
+    else
+      render :action => 'login_block', :layout => 'block'
+    end
+  end
+
   # action to register an user to the application
   def signup
     begin
@@ -329,4 +329,8 @@ module ApplicationHelper
     end
   end
+  def user
+    @controller.send(:user)
+  end
+
 end
@@ -20,7 +20,7 @@ module BoxesHelper
   def display_boxes(holder, main_content)
     boxes = holder.boxes.first(holder.boxes_limit)
-    content = boxes.reverse.map { |item| display_box(item, main_content) }.join("\n")
+    content = boxes.map { |item| display_box(item, main_content) }.join("\n")
     content = main_content if (content.blank?)
     content_tag('div', content, :class => 'boxes', :id => 'boxes' )
   end
@@ -40,7 +40,7 @@ module BoxesHelper
   end
   def display_block(block, main_content = nil)
-    content = block.content(main_content)
+    content = block.main? ? main_content : block.content
     result = 
       case content
       when Hash
@@ -53,7 +53,7 @@ module BoxesHelper
         end
       end
-    classes = 'block' # ['block', block.class.name.underscore.gsub('_', '-') ].uniq.join(' ')
+    classes = ['block', block.class.name.underscore.gsub('_', '-') ].uniq.join(' ')
     box_decorator.block_target(block.box, block) + content_tag('div', result + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block)
   end
@@ -19,4 +19,8 @@ class Block &lt; ActiveRecord::Base
     nil
   end
+  def main?
+    false
+  end
+
 end
@@ -0,0 +1,11 @@
+class LoginBlock < Block
+
+  def self.description
+    _('A login box for your users.')
+  end
+
+  def content
+    { :controller => 'account', :action => 'login_block' }
+  end
+
+end
@@ -8,4 +8,8 @@ class MainBlock &lt; Block
     main_content
   end
+  def main?
+    true
+  end
+
 end
@@ -0,0 +1,22 @@
+<div id="login-box">
+  <% unless logged_in? %>
+
+    <h2><%= _('Login') %></h2>
+    
+    <% labelled_form_for :user, @user, :url => { :controller => 'account', :action => 'login' } do |f| %>
+      <%= display_form_field(_('Username'), text_field_tag(:login) ) %>
+      <%= display_form_field(_('Password'), password_field_tag(:password) ) %>
+      <div>
+        <%= submit_button( 'login', _('Log in') )%>
+      </div>
+    <% end %>
+
+    <div>
+      <%= link_to _("New user"), :controller => 'account', :action => 'signup' %>
+    </div>
+  <% else %>
+    <h2><%= @profile.identifier %></h2>
+  <% end %>
+
+</div><!-- end id="login-box" -->
+
@@ -0,0 +1,6 @@
+<h2><%= user.identifier %></h2>
+
+<ul>
+  <li><%= _('User since %d') % user.person_info.created_at.year %></li>
+  <li><%= link_to_homepage _('Homepage') %></li>
+</ul>
@@ -0,0 +1 @@
+box_organizer/
 \ No newline at end of file
@@ -2,9 +2,6 @@
 <h1><%= @environment.name %></h1>
-<%# FIXME %>
-<%= render :file => 'account/login.rhtml' %>
-
 <h2><%= _('Recent articles') %></h2>
 <% for article in @articles %>
@@ -30,7 +30,7 @@
     <% end %>
   </head>
-  <body class='category<%= category_color %>' onload='noosfero_init();'>
+  <body class='noosfero category<%= category_color %>' onload='noosfero_init();'>
     <% unless flash[:notice].nil? %>
       <div id='notice' onclick="Element.hide('notice');">
@@ -0,0 +1,25 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>noosfero block</title>
+
+    <%= stylesheet_link_tag 'common' %>
+    <%= stylesheet_link_tag 'button' %>
+    <%= stylesheet_link_tag 'search' %>
+    <%= stylesheet_link_tag 'block' %>
+
+
+    <%# FIXME %>
+    <%= stylesheet_link_tag '/designs/templates/default/stylesheets/style.css' %>
+    <%= stylesheet_link_tag '/designs/icons/default/style.css' %>
+
+    <%= javascript_include_tag(:defaults) %>
+
+    <base target='_top'/>
+  </head>
+
+  <body class='noosfero-block'>
+    <%= yield %>
+  </body>
+
+</html>
@@ -38,6 +38,7 @@ gtk-go-up.png             Nuovo        stock/
 gtk-go-down.png           Nuovo        stock/
 gnome-search.png          Nuovo        apps/
 gtk-ok.png                Nuovo        stock/
+password.png              Nuovo        apps/
 ### END OF ICONS LISTING ###
 Licensing of GNOME themes
@@ -18,3 +18,4 @@
 .button.down { background-image: url(gtk-go-down.png); }
 .button.search { background-image: url(gnome-search.png); }
 .button.ok { background-image: url(gtk-ok.png); }
+.button.login { background-image: url(password.png); }
@@ -0,0 +1,20 @@
+body.noosfero-block {
+  background: white;
+  font-size: 12px;
+}
+
+h2 {
+  padding: 0px;
+  margin: 0px;
+  font-size: 14px;
+  border-bottom: 1px solid black;
+}
+
+input {
+  font-size: 10px;
+}
+
+#login-box {
+  text-align: center;
+}
+
+/***********************************************************
+ * style for blocks 
+ ***********************************************************/
-/* main box */
-div.box-1 {
-  margin-left: 210px;
-  margin-right: 210px;
-}
-
-div.box-2 {
-  float: left;
-  width: 200px;
-}
-
-div.box-3 {
-  float: right;
-  width: 200px;
+.block iframe {
+  width: 100%;
+  border: none;
 }
-
-.block {
-  margin: 5px;
-  padding: 5px;
-}
+/***********************************************************
+ * the handles to where you can drag the blocks
+ ***********************************************************/
 .block-target {
   margin: 5px;
@@ -34,11 +24,6 @@ div.box-3 {
   height: 30px;
 }
-.block iframe {
-  width: 100%;
-  border: none;
-}
-
 /***********************************************************
  * put borders around boxes and blocks when organizing boxes
  ***********************************************************/
@@ -3,6 +3,8 @@ body {
   margin: 0px;
   font-family: Verdana, Sans-Serif;
   font-size: 14px;
+}
+body.noosfero {
   /*
   ** a imagem de fundo colorida é mais pesada, por isso carregamos
   ** essa cinza mais leve antes para melhorar a esperiência do usuário.
@@ -24,7 +26,7 @@ body.category3 #wrap { background-image: url(&quot;../images/bg-top-lilas.png&quot;);    }
 body.category4 #wrap { background-image: url("../images/bg-top-vermelho.png"); }
 #header {
-  height: 60px;
+  height: 30px;
 }
 #design_boxes {
@@ -4,4 +4,5 @@ person_info_for_ze:
   name: "Zé, José, Zezinho"
   address: "house of the hat"
   contact_information: "Pavilhão 9, Quadrante 13, Esquina com Avenida das Alamedas, 467, fundos, falar com Dona Ivete após as 16"
+  created_at: '2007-12-01'
@@ -246,6 +246,18 @@ class AccountControllerTest &lt; Test::Unit::TestCase
     assert_no_tag :tag => "body" # e.g. no layout
   end
+  should 'provide login block' do
+    get :login_block
+    assert_template 'login_block'
+    assert_tag :tag => 'body', :attributes => { :class => 'noosfero-block' }
+  end
+
+  should 'display user info in login block when logged in' do
+    login_as('ze')
+    get :login_block
+    assert_template 'user_info'
+  end
+
   protected
     def create_user(options = {})
       post :signup, :user => { :login => 'quire', :email => 'quire@example.com', 
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'environment_design_controller'
+
+# Re-raise errors caught by the controller.
+class EnvironmentDesignController; def rescue_action(e) raise e end; end
+
+class EnvironmentDesignControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = EnvironmentDesignController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class LoginBlockTest < Test::Unit::TestCase
+
+  def setup
+    @block = LoginBlock.new
+  end
+  attr_reader :block
+
+  should 'describe itself' do
+    assert_not_equal Block.description, LoginBlock.description
+  end
+
+  should 'point to account/login_block' do
+    assert_equal({ :controller => 'account', :action => 'login_block' }, block.content)
+  end
+
+end
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+class EnvironmentDesignController < BoxOrganizerController
	2	+
	3	+ def available_blocks
	4	+ @available_blocks \|\|= [ LoginBlock ]
	5	+ end
	6	+
	7	+end
1	class BoxOrganizerController < ApplicationController	1	class BoxOrganizerController < ApplicationController
2		2
		3	+ def index
		4	+ end
		5	+
3	def move_block	6	def move_block
4	@block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))	7	@block = boxes_holder.blocks.find(params[:id].gsub(/^block-/, ''))
5		8
	@@ -6,8 +6,4 @@ class ProfileDesignController < BoxOrganizerController		@@ -6,8 +6,4 @@ class ProfileDesignController < BoxOrganizerController
6	@available_blocks \|\|= [ Block, ArticleBlock ]	6	@available_blocks \|\|= [ Block, ArticleBlock ]
7	end	7	end
8		8
9	- def index
10	- end
11	-
12	-
13	end	9	end
	@@ -34,6 +34,14 @@ class AccountController < PublicController		@@ -34,6 +34,14 @@ class AccountController < PublicController
34	render :action => 'login', :layout => false	34	render :action => 'login', :layout => false
35	end	35	end
36		36
		37	+ def login_block
		38	+ if logged_in?
		39	+ render :action => 'user_info', :layout => 'block'
		40	+ else
		41	+ render :action => 'login_block', :layout => 'block'
		42	+ end
		43	+ end
		44	+
37	# action to register an user to the application	45	# action to register an user to the application
38	def signup	46	def signup
39	begin	47	begin
	@@ -329,4 +329,8 @@ module ApplicationHelper		@@ -329,4 +329,8 @@ module ApplicationHelper
329	end	329	end
330	end	330	end
331		331
		332	+ def user
		333	+ @controller.send(:user)
		334	+ end
		335	+
332	end	336	end
	@@ -20,7 +20,7 @@ module BoxesHelper		@@ -20,7 +20,7 @@ module BoxesHelper
20		20
21	def display_boxes(holder, main_content)	21	def display_boxes(holder, main_content)
22	boxes = holder.boxes.first(holder.boxes_limit)	22	boxes = holder.boxes.first(holder.boxes_limit)
23	- content = boxes.reverse.map { \|item\| display_box(item, main_content) }.join("\n")	23	+ content = boxes.map { \|item\| display_box(item, main_content) }.join("\n")
24	content = main_content if (content.blank?)	24	content = main_content if (content.blank?)
25	content_tag('div', content, :class => 'boxes', :id => 'boxes' )	25	content_tag('div', content, :class => 'boxes', :id => 'boxes' )
26	end	26	end
	@@ -40,7 +40,7 @@ module BoxesHelper		@@ -40,7 +40,7 @@ module BoxesHelper
40	end	40	end
41		41
42	def display_block(block, main_content = nil)	42	def display_block(block, main_content = nil)
43	- content = block.content(main_content)	43	+ content = block.main? ? main_content : block.content
44	result =	44	result =
45	case content	45	case content
46	when Hash	46	when Hash
	@@ -53,7 +53,7 @@ module BoxesHelper		@@ -53,7 +53,7 @@ module BoxesHelper
53	end	53	end
54	end	54	end
55		55
56	- classes = 'block' # ['block', block.class.name.underscore.gsub('_', '-') ].uniq.join(' ')	56	+ classes = ['block', block.class.name.underscore.gsub('_', '-') ].uniq.join(' ')
57		57
58	box_decorator.block_target(block.box, block) + content_tag('div', result + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block)	58	box_decorator.block_target(block.box, block) + content_tag('div', result + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block)
59	end	59	end
	@@ -19,4 +19,8 @@ class Block < ActiveRecord::Base		@@ -19,4 +19,8 @@ class Block < ActiveRecord::Base
19	nil	19	nil
20	end	20	end
21		21
		22	+ def main?
		23	+ false
		24	+ end
		25	+
22	end	26	end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class LoginBlock < Block
	2	+
	3	+ def self.description
	4	+ _('A login box for your users.')
	5	+ end
	6	+
	7	+ def content
	8	+ { :controller => 'account', :action => 'login_block' }
	9	+ end
	10	+
	11	+end
	@@ -8,4 +8,8 @@ class MainBlock < Block		@@ -8,4 +8,8 @@ class MainBlock < Block
8	main_content	8	main_content
9	end	9	end
10		10
		11	+ def main?
		12	+ true
		13	+ end
		14	+
11	end	15	end
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+<div id="login-box">
	2	+ <% unless logged_in? %>
	3	+
	4	+ <h2><%= _('Login') %></h2>
	5	+
	6	+ <% labelled_form_for :user, @user, :url => { :controller => 'account', :action => 'login' } do \|f\| %>
	7	+ <%= display_form_field(_('Username'), text_field_tag(:login) ) %>
	8	+ <%= display_form_field(_('Password'), password_field_tag(:password) ) %>
	9	+ <div>
	10	+ <%= submit_button( 'login', _('Log in') )%>
	11	+ </div>
	12	+ <% end %>
	13	+
	14	+ <div>
	15	+ <%= link_to _("New user"), :controller => 'account', :action => 'signup' %>
	16	+ </div>
	17	+ <% else %>
	18	+ <h2><%= @profile.identifier %></h2>
	19	+ <% end %>
	20	+
	21	+</div><!-- end id="login-box" -->
	22	+