nicolas/pic_vert_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug forum

Browse Source
This commit is contained in:
Nicolas Bally 2014-12-10 23:14:24 +01:00
parent f3e0c7f70d
commit feb43eaed5
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/views/layouts/forum.haml
View File

@ -15,40 +15,41 @@
%body.admin %body.admin
%nav#admin_nav.navbar.navbar-default.navbar-inverse{role: "navigation", :style => "border-radius:0;"} -if current_fuser
.container-fluid %nav#admin_nav.navbar.navbar-default.navbar-inverse{role: "navigation", :style => "border-radius:0;"}
/ Brand and toggle get grouped for better mobile display .container-fluid
.navbar-header / Brand and toggle get grouped for better mobile display
%button.navbar-toggle{"data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", type: "button"} .navbar-header
%span.sr-only Toggle navigation %button.navbar-toggle{"data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", type: "button"}
%span.icon-bar %span.sr-only Toggle navigation
%span.icon-bar %span.icon-bar
%span.icon-bar %span.icon-bar
%a.navbar-brand{href: "/forum"} %span.icon-bar
=ic(:home, :icon => false) %a.navbar-brand{href: "/forum"}
Forum du Pic Vert =ic(:home, :icon => false)
Forum du Pic Vert
#bs-example-navbar-collapse-1.collapse.navbar-collapse #bs-example-navbar-collapse-1.collapse.navbar-collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li=link_to "Fils de discussion", forum_forum_topics_path %li=link_to "Fils de discussion", forum_forum_topics_path
%li=link_to "Utilisateurs", forum_forum_users_path %li=link_to "Utilisateurs", forum_forum_users_path
%li=link_to "Catégories", forum_forum_categories_path if moderator? %li=link_to "Catégories", forum_forum_categories_path if moderator?
%ul.nav.navbar-nav.navbar-right %ul.nav.navbar-nav.navbar-right
%li.dropdown %li.dropdown
%a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}} %a{:href => "#", :class => "dropdown-toggle", :data => {:toggle => "dropdown"}}
=image_tag (current_fuser.avatar? ? current_fuser.avatar.square.url : ""), :class => "img img-rounded", :style => "height:15px;" =image_tag (current_fuser.avatar? ? current_fuser.avatar.square.url : ""), :class => "img img-rounded", :style => "height:15px;"
=current_fuser.firstname =current_fuser.firstname
=current_fuser.name =current_fuser.name
%b.caret %b.caret
%ul.dropdown-menu %ul.dropdown-menu
%li=link_to "Mon profil", [:forum, current_fuser] %li=link_to "Mon profil", [:forum, current_fuser]
%li= link_to "Mes paramètres", edit_forum_forum_user_path(current_fuser) %li= link_to "Mes paramètres", edit_forum_forum_user_path(current_fuser)
%li.divider %li.divider
%li=link_to "se déconnecter", logout_forum_auths_path, :method => :delete %li=link_to "se déconnecter", logout_forum_auths_path, :method => :delete

4
db/migrate/20130114112013_create_forum_users.rb
View File

@ -27,8 +27,8 @@ class CreateForumUsers < ActiveRecord::Migration
t.string :current_sign_in_ip t.string :current_sign_in_ip
t.string :last_sign_in_ip t.string :last_sign_in_ip
t.boolean :lock t.boolean :lock
t.datetime :locked_at t.datetime :locked_at