Skip to content
Extraits de code Groupes Projets
Valider 57796106 rédigé par Raphael's avatar Raphael
Parcourir les fichiers

messed with the views

parent 559b6cd0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
app/helpers/application_helper.rb
+ 1
− 1
Voir le fichier @ 57796106
...@@ -48,7 +48,7 @@ module ApplicationHelper ...@@ -48,7 +48,7 @@ module ApplicationHelper
image_location = person.profile.image_url image_location = person.profile.image_url
image_location ||= "/images/user/default.jpg" image_location ||= "/images/user/default.jpg"
image_tag image_location, :class => "person_picture", :alt => person.real_name, :title => person.real_name image_tag image_location, :class => "avatar", :alt => person.real_name, :title => person.real_name
end end
def person_image_link(person) def person_image_link(person)
......
app/views/shared/_publisher.haml
+ 13
− 20
Voir le fichier @ 57796106
#publisher #publisher
.span-19.last = owner_image_tag
= form_for StatusMessage.new, :remote => true do |f|
= f.error_messages
.span-15 = form_for StatusMessage.new, :remote => true do |f|
.span-2 = f.error_messages
.user_image %p
= owner_image_tag %label{:for => "status_message_message"} Message
.span-13.last = f.text_area :message, :rows => 2
%p
%label{:for => "status_message_message"} Message
= f.text_area :message, :rows => 2
.span-3 %ul.group_selector
%ul.group_selector going to...
going to... - for group in current_user.groups
- for group in current_user.groups %li
%li = check_box_tag("group_ids[]", group.id, current_group?(group) )
= check_box_tag("group_ids[]", group.id, current_group?(group) ) = group.name
= group.name = f.submit "Post"
.span-1.last
= f.submit "Post"
app/views/status_messages/_status_message.html.haml
+ 10
− 9
Voir le fichier @ 57796106
...@@ -2,15 +2,16 @@ ...@@ -2,15 +2,16 @@
= person_image_link(post.person) = person_image_link(post.person)
%span.from .content
= link_to post.person.real_name, post.person %span.from
= auto_link sanitize post.message = link_to post.person.real_name, post.person
= auto_link sanitize post.message
%div.time
= link_to(how_long_ago(post), object_path(post)) %div.info
\-- = link_to(how_long_ago(post), object_path(post))
= link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" \--
= render "comments/comments", :post => post = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
= render "comments/comments", :post => post
- if current_user.owns?(post) - if current_user.owns?(post)
.destroy_link .destroy_link
......
public/stylesheets/application.css
+ 30
− 29
Voir le fichier @ 57796106
...@@ -19,6 +19,9 @@ a { ...@@ -19,6 +19,9 @@ a {
background-color: #018790; background-color: #018790;
background-color: #556270; } background-color: #556270; }
.avatar {
width: 50px; }
#flash_notice, #flash_notice,
#flash_error, #flash_error,
#flash_alert { #flash_alert {
...@@ -113,35 +116,29 @@ header { ...@@ -113,35 +116,29 @@ header {
#main { #main {
width: 100%; } width: 100%; }
ul#stream, ul#friend_stream { ul#stream {
margin: 0; margin: 0;
padding: 0; } padding: 0; }
ul#stream > li, ul#friend_stream > li { ul#stream > li {
min-height: 50px;
list-style: none; list-style: none;
padding: 15px 0; padding: 12px 0;
margin-bottom: 5px;
border-bottom: 1px solid #eeeeee; } border-bottom: 1px solid #eeeeee; }
ul#friend_stream > li {
padding: 0.2em 0; }
ul#friend_stream img {
width: 25px;
max-width: 25px;
position: relative;
float: none;
display: inline; }
li.message { li.message {
position: relative; position: relative;
line-height: 140%; line-height: 140%;
font-family: "Lucida Grande", sans-serif; font-family: "Lucida Grande", sans-serif;
color: #999999; } color: #999999; }
li.message span.from { li.message .avatar {
float: left;
margin-right: 15px; }
li.message .content span.from {
color: black; color: black;
font-weight: normal; font-weight: normal;
margin-right: 0.2em; margin-right: 0.2em;
font-size: 110%; } font-size: 110%; }
li.message div.time { li.message .content div.info {
color: #bababa; color: #bababa;
font-size: 70%; } font-size: 70%; }
...@@ -304,25 +301,32 @@ label { ...@@ -304,25 +301,32 @@ label {
font-weight: normal; } font-weight: normal; }
#publisher { #publisher {
background-color: rgba(10, 81, 109, 0.05);
border-bottom: 2px #999999 solid; border-bottom: 2px #999999 solid;
color: #999999; color: #999999;
position: relative; position: relative;
height: 69px; } height: 63px;
margin-bottom: 5px; }
#publisher .avatar {
float: left;
margin-right: 15px; }
#publisher p {
position: absolute;
left: 0; }
#publisher form { #publisher form {
margin-top: 10px; } display: inline; }
#publisher form input[type='submit'] {
float: right;
margin-right: 20px;
margin-top: 28px; }
#publisher textarea { #publisher textarea {
width: 485px; width: 485px;
height: 40px; height: 40px;
margin-top: 0; } margin-top: 0; }
#publisher .user_image img {
height: 50px;
padding-left: 10px; }
#publisher ul.group_selector { #publisher ul.group_selector {
float: left; left: 510px;
padding: 0; padding: 0;
margin: 0; margin: 0;
width: auto; width: 110px;
z-index: 10; z-index: 10;
position: absolute; position: absolute;
height: auto; height: auto;
...@@ -333,7 +337,7 @@ label { ...@@ -333,7 +337,7 @@ label {
font-size: smaller; font-size: smaller;
padding: 2px; padding: 2px;
display: none; display: none;
background-color: white; } background-color: #eeeeee; }
#publisher ul.group_selector > li:active { #publisher ul.group_selector > li:active {
background-color: yellow; } background-color: yellow; }
#publisher ul.group_selector:hover li { #publisher ul.group_selector:hover li {
...@@ -452,9 +456,6 @@ h1.big_text { ...@@ -452,9 +456,6 @@ h1.big_text {
#group ul .selected:hover a { #group ul .selected:hover a {
background-color: #eeeeee; } background-color: #eeeeee; }
#friend_pictures img {
height: 40px; }
#add_photo_loader { #add_photo_loader {
position: absolute; position: absolute;
display: none; display: none;
...@@ -504,8 +505,8 @@ h1.big_text { ...@@ -504,8 +505,8 @@ h1.big_text {
color: #999999; } color: #999999; }
#other_user_menu > li:first-child img { #other_user_menu > li:first-child img {
position: absolute; position: absolute;
height: 20px; width: 20px;
top: 5px; top: 3px;
left: 9px; } left: 9px; }
#other_user_menu > li:last-child { #other_user_menu > li:last-child {
border-bottom: 2px solid black; } border-bottom: 2px solid black; }
......
public/stylesheets/sass/application.sass
+ 47
− 45
Voir le fichier @ 57796106
...@@ -20,6 +20,9 @@ a ...@@ -20,6 +20,9 @@ a
:color #018790 :color #018790
:color #556270 :color #556270
.avatar
:width 50px
#flash_notice, #flash_notice,
#flash_error, #flash_error,
#flash_alert #flash_alert
...@@ -131,28 +134,16 @@ header ...@@ -131,28 +134,16 @@ header
#main #main
:width 100% :width 100%
ul#stream, ul#friend_stream ul#stream
:margin 0 :margin 0
:padding 0 :padding 0
> li > li
:min-height 50px
:list-style none :list-style none
:padding 15px 0 :padding 12px 0
:margin-bottom 5px
:border :border
:bottom 1px solid #eee :bottom 1px solid #eee
ul#friend_stream
> li
:padding 0.2em 0
img
:width 25px
:max-width 25px
:position relative
:float none
:display inline
li.message li.message
:position relative :position relative
:line-height 140% :line-height 140%
...@@ -160,18 +151,25 @@ li.message ...@@ -160,18 +151,25 @@ li.message
:family 'Lucida Grande', sans-serif :family 'Lucida Grande', sans-serif
:color #999 :color #999
span.from .avatar
:color #000 :float left
:font
:weight normal
:margin :margin
:right 0.2em :right 15px
:font
:size 110%
.content
span.from
:color #000
:font
:weight normal
:margin
:right 0.2em
:font
:size 110%
div.time div.info
:color #bababa :color #bababa
:font-size 70% :font-size 70%
h1 h1
:position relative :position relative
...@@ -373,17 +371,31 @@ label ...@@ -373,17 +371,31 @@ label
:weight normal :weight normal
#publisher #publisher
:background
:color rgba(10,81,109,0.05)
:border :border
:bottom 2px #999 solid :bottom 2px #999 solid
:color #999 :color #999
:position relative :position relative
:height 69px :height 63px
:margin
:bottom 5px
form .avatar
:float left
:margin :margin
:top 10px :right 15px
p
:position absolute
:left 0
form
:display inline
input[type='submit']
:float right
:margin
:right 20px
:top 28px
textarea textarea
:width 485px :width 485px
...@@ -391,17 +403,11 @@ label ...@@ -391,17 +403,11 @@ label
:margin :margin
:top 0 :top 0
.user_image
img
:height 50px
:padding
:left 10px
ul.group_selector ul.group_selector
:float left :left 510px
:padding 0 :padding 0
:margin 0 :margin 0
:width auto :width 110px
:z-index 10 :z-index 10
:position absolute :position absolute
:height auto :height auto
...@@ -415,7 +421,7 @@ label ...@@ -415,7 +421,7 @@ label
:padding 2px :padding 2px
:display none :display none
:background :background
:color #fff :color #eee
&:active &:active
:background :background
...@@ -581,10 +587,6 @@ h1.big_text ...@@ -581,10 +587,6 @@ h1.big_text
:background :background
:color #eee :color #eee
#friend_pictures
img
:height 40px
#add_photo_loader #add_photo_loader
:position absolute :position absolute
...@@ -651,8 +653,8 @@ h1.big_text ...@@ -651,8 +653,8 @@ h1.big_text
img img
:position absolute :position absolute
:height 20px :width 20px
:top 5px :top 3px
:left 9px :left 9px
&:last-child &:last-child
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter