Changeset 1362

Timestamp:

08/25/08 14:03:31 (5 months ago)

Author:

alban

Message:

Mise en place de user/show avec la liste des groupes et les infos du compte. Refs #19

Files:

• trunk/app/controllers/user_controller.rb (added)
• trunk/app/controllers/users_controller.rb (modified) (1 diff)
• trunk/app/helpers/user_helper.rb (added)
• trunk/app/views/layouts/documents.rhtml (modified) (1 diff)
• trunk/app/views/user (added)
• trunk/app/views/user/edit.rhtml (moved) (moved from trunk/app/views/users/options.rhtml) (1 diff)
• trunk/app/views/user/show.rhtml (added)
• trunk/app/views/users/_sidebar.rhtml (modified) (1 diff)
• trunk/config/custom.rb (modified) (1 diff)
• trunk/config/routes.rb (modified) (2 diffs)
• trunk/lib/core_ext.rb (added)
• trunk/public/stylesheets/screen.css (modified) (4 diffs)

trunk/app/controllers/users_controller.rb

@@ -40 +40 @@
-                @document = user.documents.find_by_keywords(params[:keywords])
-                @subscription = user.find_subscriptions(:keywords => params[:keywords])
-        end
-
-        def options
-                @user = User.find(session[:user])
-          @users = User.find(:all, :conditions => ["id != ?", @user.id])
-                if request.post?
-                        if @user.update_attributes(params[:user])
-                                flash[:success] = "Vos informations ont bien été modifié"
-                        else
-                                flash[:failure] = "Vos informations n'ont pas été modifié"
-                        end
-                end
-        end
-

trunk/app/views/layouts/documents.rhtml

@@ -19 +19 @@
-   <ul>
-    <% if session[:user] %>
-Dashboa
-Options", :controller => "users", :action => "options
+Tableau de bo
+Mon compte", :controller => "user", :action => "show
-     <li><%= link_to("Quitter", :controller => "users", :action => "signout") %></li>
-    <% else %>

trunk/app/views/user/edit.rhtml

@@ -8 +8 @@
- <p><label for="user_organization">Organisme :</label><br/>
- <%= text_field("user", "organization") %></p>
-
-
+
+
+
+

trunk/app/views/users/_sidebar.rhtml

@@ -24 +24 @@
-<h2>Participez</h2>
-<p>
- 
+
-</p>
-<p>

trunk/config/custom.rb

@@ -1 +1 @@
-ActionMailer::Base.default_charset = "utf-8"
-ActionMailer::Base.delivery_method = :sendmail
+
+require 'core_ext'

trunk/config/routes.rb

@@ -1 +1 @@
-ActionController::Routing::Routes.draw do |map|
-  # The priority is based upon order of creation: first created -> highest priority.
-
+
-  # Sample of regular route:
-  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
@@ -28 +28 @@
-  map.connect 'casts/:name', :controller => 'casts', :action => 'play'
-  map.connect 'casts/:name.:format', :controller => 'casts', :action => 'play'
+  map.connect 'user/:action', :controller => 'user'
+
-  map.connect ':action/:id/:confirm', :controller => 'users', :action => 'confirm'
-        map.connect ':action/:id', :controller => 'users'
-
- 
+
+
-  # -- just remember to delete public/index.html.
-  map.connect '', :controller => 'users', :action => 'welcome'

trunk/public/stylesheets/screen.css

@@ -48 +48 @@
-#frame .unavailable { background: url("../images/unavailable.png") no-repeat; }
-#frame .signup { background: url("../images/author.png") no-repeat; }
- 
+
-#frame .size { background: url("../images/size.png") no-repeat; }
-#frame .note { background: url("../images/note.png") no-repeat; }
@@ -58 +58 @@
-#content p { margin: 0 0 0 6px; }
-#content li { position: relative; margin: 0 12px 8px; padding: 8px 0 0; }
- 
+
-#content li.vcard { float: left; width: 45%; padding: 10px 0; }
-#content li.vcard img.photo { float: left; margin: 0 10px 0 0; text-align: center; padding: 2px; border: 1px solid #ccc; background: #fff; }
@@ -73 +73 @@
-#content a:hover.rel-tag { text-decoration: none; background: #efefef; }
-ul#welcome { margin: 16px 100px 16px 14px; }
+
+#content dl { margin-left: 12px; }
+#content dl dd { padding: 0; margin: 0; }
+#content dl dt { margin-top: 12px; }
-
-#welcome li { margin: 6px; color: #000; padding: 4px 4px 4px 28px; background: #fff url("../images/tick.png") no-repeat 4px 4px; }
@@ -100 +104 @@
-
-#errors ul { margin: 0 12px 14px 14px; list-style-type: square; }
- 
+
-
-p#cloud { margin-bottom: 8px; }