mirror of
https://github.com/wahyd4/ocelots.git
synced 2026-08-09 04:56:21 +10:00
ux experience improved
This commit is contained in:
@@ -111,5 +111,27 @@ body {
|
||||
margin-right:8px;
|
||||
}
|
||||
|
||||
.panel{
|
||||
background: #f2f2f2;
|
||||
border: solid 1px #e6e6e6;
|
||||
margin: 0 0 22px 0;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
|
||||
.avatar-hover{
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
display: none;
|
||||
border-radius: 150px;
|
||||
text-align: center;
|
||||
background: rgba(14, 238, 112, 0.61);
|
||||
width: 300px;
|
||||
height: 300px;
|
||||
}
|
||||
.avatar-info:hover + .avatar-hover{
|
||||
display: block;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -13,7 +13,8 @@ class HomeController < ApplicationController
|
||||
session[:initial_url] = nil
|
||||
redirect_to redirect_url
|
||||
else
|
||||
@people = Person.find(:all, :conditions => ["show_avatar=true"], :order => "RANDOM()", :limit => 4)
|
||||
#@people = Person.find(:all, :conditions => ["show_avatar=true"], :order => "RANDOM()", :limit => 4)
|
||||
@people = Person.where(show_avatar:true).order("RANDOM()").limit(4)
|
||||
@google_login = google_oauth_url
|
||||
render layout: 'landing'
|
||||
end
|
||||
|
||||
@@ -3,6 +3,10 @@ module ApplicationHelper
|
||||
image_tag person.photo? ? person.photo.url(:square) : person.gravatar_url ,class:'avatar-image'
|
||||
end
|
||||
|
||||
def image_for_without_radius person
|
||||
image_tag person.photo? ? person.photo.url(:square) : person.gravatar_url
|
||||
end
|
||||
|
||||
def phone_link_to phone
|
||||
phone.blank? ? '' : link_to(phone,"tel://#{phone.gsub(/\D/,'')}")
|
||||
end
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
div.hero-unit.highlight.sexy-bg class="#{membership.status}"
|
||||
div.row
|
||||
div.span4
|
||||
a href="/profiles/#{membership.account}"
|
||||
=image_for membership.person
|
||||
div.span4
|
||||
= render partial: 'shared/person', locals: {person: membership.person}
|
||||
= render partial: 'shared/membership', locals: {membership: membership}
|
||||
div.span4.highlight class="#{membership.status}" style="position:relative;"
|
||||
div.avatar-info
|
||||
=image_for membership.person
|
||||
div.avatar-hover
|
||||
a href="/profiles/#{membership.account}"
|
||||
h1 style="margin-top:3.5em" = membership.person.full_name
|
||||
-if membership.person == @current_person
|
||||
= link_to 'edit membership', '#add_sc', class: 'fancybox btn btn-primary'
|
||||
div id="add_sc" style="display:none;"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
- @team.people.each do |person|
|
||||
div.avatar
|
||||
a href="/profiles/#{person.account}" target="_blank"
|
||||
=image_for person
|
||||
=image_for_without_radius person
|
||||
h2 #{person.full_name}
|
||||
- if person.job_title
|
||||
i #{person.job_title}
|
||||
@@ -42,9 +42,9 @@ div.team-content
|
||||
input.span2.search-query id="show-filter" type="text" placeholder="search" style="float:right;margin-bottom: 10px;margin-right: 10px;"
|
||||
|
||||
div.clear
|
||||
|
||||
- @team.memberships.each do |membership|
|
||||
= render partial: membership_partial(membership), locals: {membership: membership, current_person: @current_person}
|
||||
div.row-fluid
|
||||
- @team.memberships.each do |membership|
|
||||
= render partial: membership_partial(membership), locals: {membership: membership, current_person: @current_person}
|
||||
|
||||
div#new-content style="display:none;"
|
||||
p.lead Add new team members
|
||||
|
||||
Reference in New Issue
Block a user