Skip to content
Extraits de code Groupes Projets
Valider 96fa34ea rédigé par danielvincent's avatar danielvincent
Parcourir les fichiers

changed the pop-up boxes. going to probably switch to fancybox jquery...

changed the pop-up boxes.  going to probably switch to fancybox jquery plugin...  also, fixed the user page so viewing it doesn't throw an error.
parent fd8d92a0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -5,8 +5,8 @@ class UsersController < ApplicationController
@users = User.sort(:created_at.desc).all
end
def show
@user= Person.first(:id => params[:id])
@user_profile = @user.profile
@user= User.first(:id => params[:id])
@user_profile = @user.person.profile
end
def edit
......
......@@ -12,6 +12,10 @@
%p
= a.text_field :name
%ul
- for photo in @album.photos
%li.photo_edit_block= image_tag photo.image.url(:thumb_large)
#submit_block
= link_to "Cancel", root_path
or
......
%h1 Add a new group
= form_for Group.new do |f|
= f.error_messages
%p
= f.label :name
= f.text_field :name
= f.submit 'create', :class => 'button'
.right
= f.submit 'create', :class => 'button'
......@@ -9,7 +9,7 @@
},
onFinish: function(event, total){
$("#add_photo_button .button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(0);
$("#add_photo_loader").fadeOut(400);
},
onStart: function(event, total){
$("#add_photo_pane").fadeOut(400);
......@@ -20,6 +20,7 @@
});
});
%h1= "Add photos to #{album.name}"
= form_for photo, :html => {:multipart => true} do |f|
= f.error_messages
= f.hidden_field :album_id, :value => album.id
......
%h1= "Add a new friend to #{@group.name}"
= form_for Request.new do |f|
= f.error_messages
Enter a Diaspora URL, Diaspora username, or random email address:
.field_with_submit
= f.text_field :destination_url
= f.hidden_field :group, :value => @group.id
= f.submit
= f.text_field :destination_url
= f.hidden_field :group, :value => @group.id
= f.submit
#group
%ul
- for group in @groups
%li= link_to group.name, root_path(:group =>group.id)
%li{:class => ("selected" if group.id.to_s == params[:group])}
= link_to group.name, root_path(:group =>group.id)
%li#add_group_button.new_group= link_to "NEW GROUP", "#"
......
......@@ -6,6 +6,6 @@
%p
= @user.url
%p
%b Key Fingerprint
%b Serialized Key
%p
= @user.key_fingerprint
= @user.serialized_key
......@@ -439,7 +439,6 @@ h1.big_text {
margin-right: 10px; }
#group ul > li.selected, #group ul > li.selected a {
color: white;
color: black;
font-weight: bold;
font-size: 18px; }
#group a {
......
......@@ -548,7 +548,6 @@ h1.big_text
&.selected, &.selected a
:color #fff
:color #000
:font
:weight bold
:size 18px
......@@ -582,3 +581,4 @@ h1.big_text
:display none
:left -25px
:top 4px
......@@ -98,33 +98,17 @@ ul.button_set
:display none
:right 0
:background
:color rgba( 30,30,30,0.95 )
:color #fff
:border 4px solid #000
:border 2px solid #999
:border-radius 3px
:-moz-border-radius 3px
:-webkit-border-radius 3px
:border-radius 5px
:-moz-border-radius 5px
:-webkit-border-radius 5px
:box-shadow 0 0 5px #000
:-webkit-box-shadow 0 0 10px #000
:color #999
:padding 2em
:font
:size 12px
:weight normal
:line-height auto
form
:margin 0
:padding 10px
:color #999
input[type='text']
:width 80%
:display block
p
:padding 10px
:display inline
......@@ -64,23 +64,11 @@ ul.button_set {
z-index: 20;
position: absolute;
display: none;
right: 0;
background-color: rgba(30, 30, 30, 0.95);
border: 2px solid #999999;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
color: #999999;
font-size: 12px;
font-weight: normal;
line-height: auto; }
.contextual_pane form {
margin: 0;
padding: 10px;
color: #999999; }
.contextual_pane form input[type='text'] {
width: 80%;
display: block; }
.contextual_pane form p {
padding: 10px;
display: inline; }
background-color: white;
border: 4px solid black;
border-radius: 3px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
box-shadow: 0 0 5px black;
-webkit-box-shadow: 0 0 10px black;
padding: 2em; }
0% Chargement en cours 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