Skip to content

Commit

Permalink
Conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
thamizh committed Jul 13, 2013
2 parents d95a6ae + 01eff35 commit be8c1a3
Show file tree
Hide file tree
Showing 2,780 changed files with 565,187 additions and 10 deletions.
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ end

gem 'jquery-rails'

gem 'roo'

gem 'email_validator'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

Expand Down
15 changes: 15 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ GEM
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
email_validator (1.4.0)
activemodel
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
Expand All @@ -86,8 +88,11 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
mini_portile (0.5.1)
multi_json (1.7.7)
mysql2 (0.3.11)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
orm_adapter (0.4.0)
paperclip (3.4.1)
activemodel (>= 3.0.0)
Expand Down Expand Up @@ -122,11 +127,19 @@ GEM
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.4)
roo (1.11.2)
nokogiri
rubyzip
spreadsheet (> 0.6.4)
ruby-ole (1.2.11.7)
rubyzip (0.9.9)
sass (3.2.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
spreadsheet (0.8.5)
ruby-ole (>= 1.0)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
Expand Down Expand Up @@ -156,12 +169,14 @@ DEPENDENCIES
better_errors
coffee-rails (~> 3.2.1)
devise
email_validator
jquery-rails
jquery-tokeninput-rails
less-rails
mysql2
paperclip
rails (= 3.2.12)
roo
sass-rails (~> 3.2.3)
therubyracer
twitter-bootstrap-rails!
Expand Down
Binary file added app/assets/images/steve-jobs.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/javascripts/static_pages.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
3 changes: 3 additions & 0 deletions app/assets/javascripts/uploads.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
113 changes: 113 additions & 0 deletions app/assets/stylesheets/search/staticpages.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
.pricing-table .plan {
border-radius: 1px;
text-align: center;
background-color: #f3f3f3;
-moz-box-shadow: 0 0 6px 2px #b0b2ab;
-webkit-box-shadow: 0 0 6px 2px #b0b2ab;
box-shadow: 0 0 6px 2px #b0b2ab;
}

.plan:hover {
background-color: #fff;
-moz-box-shadow: 0 0 12px 3px #b0b2ab;
-webkit-box-shadow: 0 0 12px 3px #b0b2ab;
box-shadow: 0 0 12px 3px #b0b2ab;
}

.plan {
margin-left: 3px !import;
padding: 20px;
color: #ff;
background-color: #5e5f59;
-moz-border-radius: 1px 1px 0 0;
-webkit-border-radius: 1px 1px 0 0;
border-radius: 1px 1px 0 0;
}
#plan1{
margin-top: 12px;
}
#plan3{
margin-top: 12px;
}
.center{
margin-left: 50px;
}
.plan-name-bronze {
padding: 20px;
color: #fff;
background-color: #665D1E;
-moz-border-radius: 1px 1px 0 0;
-webkit-border-radius: 1px 1px 0 0;
border-radius: 1px 1px 0 0;
}

.plan-name-silver {
padding: 20px;
color: #fff;
background-color: #78B306;;
-moz-border-radius: 1px 1px 0 0;
-webkit-border-radius: 1px 1px 0 0;
border-radius: 1px 1px 0 0;
}

.plan-name-gold {
padding: 20px;
color: #fff;
background-color: #FFD700;
-moz-border-radius: 1px 1px 0 0;
-webkit-border-radius: 1px 1px 0 0;
border-radius: 1px 1px 0 0;
}

.pricing-table-bronze {
padding: 20px;
color: #fff;
background-color: #f89406;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}

.pricing-table .plan .plan-name span {
font-size: 20px;
}

.pricing-table .plan ul {
list-style: none;
margin: 0;
-moz-border-radius: 0 0 5px 5px;
-webkit-border-radius: 0 0 5px 5px;
border-radius: 0 0 5px 5px;
}

.pricing-table .plan ul li.plan-feature {
padding: 15px 10px;
border-top: 1px solid #c5c8c0;
}

.pricing-three-column {
margin: 0 auto;
width: 80%;
}

.pricing-variable-height .plan {
float: none;
margin-left: 2%;
vertical-align: bottom;
display: inline-block;
zoom:1;
*display:inline;
}

.plan-mouseover .plan-name {
background-color: #4e9a06 !important;
}

.btn-plan-select {
padding: 8px 25px;
font-size: 18px;
}

#billing_header{
text-align: center;
}
3 changes: 3 additions & 0 deletions app/assets/stylesheets/static_pages.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the StaticPages controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/uploads.css.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the uploads controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
35 changes: 35 additions & 0 deletions app/assets/stylesheets/users.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@


.acc_settings_container{
border: 1px solid #DACDCC;
border-radius: 3px;
box-shadow: 0px 1px 10px 2px #ECECEC;
}

#headings_container{
margin-left: 0px;
min-height: 60px;
background: #EAF5FD;
border-bottom: 1px solid #DACDCC;
}

.headings{

}
.top-border{
margin-left: 0px;
border-top: 1px solid #DACDCC;
}
.top-padding5{

padding-top: 5px;
}
.warning{
color: #EE7E17;
}
.sub-title{
font-size: 18px;
}
.pad0{
padding:10px;
}
1 change: 1 addition & 0 deletions app/controllers/candidates_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ class CandidatesController < ApplicationController
before_filter :authenticate_user!, :get_team
layout "candidate"
def new

@candidate = @team.candidates.new
end

Expand Down
9 changes: 9 additions & 0 deletions app/controllers/static_pages_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class StaticPagesController < ApplicationController
def faq
render layout: false
end

def billing_info
render layout: false
end
end
99 changes: 99 additions & 0 deletions app/controllers/uploads_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
class UploadsController < ApplicationController
before_filter :authenticate_user!, :except => :excel_jobs
layout "candidate"

def new_upload_excel
@excel = Excel.new
end

def upload_excel
params[:excel][:user_id] = current_user.id
@excel = Excel.new(params[:excel])
if @excel.save
redirect_to new_upload_excel_path, :notice => "Upload Successfully. It will take sometime to process
the file"
else
render :action => "new_upload_excel"
end

end

def excel_jobs
@excel = Excel.where(:status => "0").all
@excel.each do |excel|


#url = excel.excel_sheet.path
#url_data = File.open(url).read()
#Rails.logger.info "sssss test: #{url}"
if Excel.import(excel.excel_sheet.path, excel.user_id)
excel.status = 1
excel.save
end

end

render :nothing => true

end


#==============linked_in========

def new_upload_linkedin
@linkedin = Linkedin.new
end

def upload_linkedin
params[:linkedin][:user_id] = current_user.id
@linkedin = Linkedin.new(params[:linkedin])
if @linkedin.save
redirect_to new_upload_linkedin_path, :notice => "Upload Successfully. It will take sometime to process
the file"
else
render :action => "new_upload_linkedin"
end

end
#=====outlook===#
def new_upload_outlook
@outlook = Outlook.new
end

def upload_outlook
params[:outlook][:user_id] = current_user.id
@outlook = Outlook.new(params[:outlook])
if @outlook.save
redirect_to new_upload_outlook_path, :notice => "Upload Successfully. It will take sometime to process
the file"
else
render :action => "new_upload_outlook"
end

end


#===========resume===============


def new_upload_doc
@resume = Doc.new
end

def upload_doc
params[:doc][:user_id] = current_user.id
@resume = Doc.new(params[:doc])
if @resume.save
redirect_to new_upload_doc_path, :notice => "Upload Successfully. It will take sometime to process
the file"
else
render :action => "new_upload_doc"
end

end

#===============resume end=================

#=====class end==============

end
26 changes: 26 additions & 0 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,30 @@ def index
@team = current_user.team
@candidates = @team.try(:candidates)
end

def acc_settings
@user=current_user
#@user.plan
max=@user.team.plan.max_user
team=@user.team
current=team.users.count
@more_visibility = current < max ? true : false

#render :json => @user
end

def add_more_user
stat=User.create(params[:user]);
if stat
@user=current_user
max=@user.team.plan.max_user
team=@user.team
current=team.users.count
@more_visibility = current < max ? true : false
status=1
else
status=0
end
render :json => {"status"=>status,"visible"=>@more_visibility}
end
end
7 changes: 7 additions & 0 deletions app/helpers/candidates_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
module CandidatesHelper

def avatar_url(candidate)
gravatar_id = Digest::MD5::hexdigest(candidate.email).downcase
"http://gravatar.com/avatar/#{gravatar_id}.png"
end

def get_tags
tags = Tag.all.map{|tag| { "id"=>tag.id,"name"=>tag.name} }
raw tags.to_json
end

end
Loading

0 comments on commit be8c1a3

Please sign in to comment.