Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 10 commits
  • 10 files changed
  • 0 commit comments
  • 1 contributor
View
4 Gemfile.lock
@@ -106,7 +106,6 @@ GEM
nokogiri (>= 1.4.4)
ruby-hmac
formatador (0.2.1)
- gem_plugin (0.2.3)
girl_friday (0.9.7)
connection_pool (~> 0.1.0)
gravatar_image_tag (1.0.0.pre2)
@@ -121,8 +120,6 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
- mongrel (1.2.0.pre2-x86-mingw32)
- gem_plugin (~> 0.2.3)
multi_json (1.0.4)
multi_xml (0.3.0)
multipart-post (1.1.4)
@@ -211,7 +208,6 @@ DEPENDENCIES
fog (= 0.5.2)
girl_friday (= 0.9.7)
gravatar_image_tag (= 1.0.0.pre2)
- mongrel (= 1.2.0.pre2)
mysql2 (< 0.3)
nokogiri
omniauth!
View
4 app/controllers/activities_controller.rb
@@ -194,8 +194,8 @@ def update_view_status
def validate_access
return if(params == nil || params[:id] == nil)
- @activity = Activity.find(params[:id])
- if(!validate_user_access_to_activity(@activity,current_account.user))
+ @activity = Activity.find_by_id(params[:id])
+ if(@activity == nil || !validate_user_access_to_activity(@activity,current_account.user))
render 'shared/access_denied'
end
View
2 app/controllers/my_devise/registrations_controller.rb
@@ -12,7 +12,7 @@ def new
puts params.inspect
@email = params[:email]
if(@email != nil)
- flash[:warning] = "Sign up with email"+@email
+ flash[:warning] = "Sign up with email "+@email
end
@title = "Sign Up"
View
2 app/controllers/pages_controller.rb
@@ -1,7 +1,7 @@
class PagesController < ApplicationController
#before_filter :authenticate_account!
before_filter :authenticate_account!, :except=>[:home1]
- skip_before_filter :authenticate_account!, :only => [:home1]
+# skip_before_filter :authenticate_account!, :only => [:home1]
# [Yaniv] This line disables the CSRF protection by rails when "post" is done outside of the controller (in our case my jQuery stuff). It's not recommended
# but to make this work I need to do something in the code which I need to continue to research
# See details here: http://stackoverflow.com/questions/3558816/what-does-this-mean-actioncontrollerinvalidauthenticitytoken
View
9 app/views/my_devise/registrations/new.html.erb
@@ -2,16 +2,10 @@
<div id="sign-in-up-box">
<h1>tiviti</h1>
- <%puts "resource= "+resource.inspect%>
- <%puts "___________________________________________________"%>
- <!--%puts "@email= "+@email%-->
- <%puts "___________________________________________________"%>
-
<div id="sign-in-up-form">
- <b>Sign up for tiviti</b></br>
-
+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
@@ -22,7 +16,6 @@
<!-- User Name -->
<div class="label">
<%= user.label :name %>
-
</div>
<%= user.text_field :name, :class => "input", :autofocus => "true" %>
View
21 app/views/pages/home.html.erb
@@ -1,10 +1,31 @@
<title>Home</title>
<% if account_signed_in? %>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
+<%puts "llllllllllllllllllllllllllllllllllllllllllllllll"%>
<%= render 'shared/dashboard' %>
<% else %>
+<%puts "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR 00000000000000000000000000000000"%>
+<%puts "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR 00000000000000000000000000000000"%>
+<%puts "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR 00000000000000000000000000000000"%>
+<%puts "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR 00000000000000000000000000000000"%>
+<%puts "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR 00000000000000000000000000000000"%>
+<%puts "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR 00000000000000000000000000000000"%>
<h1>Get stuff done faster!</h1>
<%= link_to 'Register', new_account_registration_path %> or <%= link_to 'Sign in', new_account_session_path %>
View
2 commands.txt
@@ -137,7 +137,7 @@ git push heroku -app staging
You will receive an email with instructions about how to reset your password in a few minutes.
$ git add .
-git commit -am "1-18-12 link to tivit staging 1"
+git commit -am "2-16-12"
git commit -am "1-25-12 staging 1"
git commit -am "1-29-12 yanivs bug fixes stg 1"
git commit -am "1-31-12 autocomplete"
View
1 config/locales/devise.en.yml
@@ -35,7 +35,6 @@ en:
confirmed: 'Your account was successfully confirmed. You are now signed in.'
registrations:
signed_up: 'Welcome! You have signed up successfully.'
- inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
reasons:
View
BIN public/images/howitworks.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
7 public/stylesheets/tiviti-styles.css
@@ -71,19 +71,20 @@ a:visited {
background: url('/images/howitworks.png') no-repeat scroll center center transparent;
display: inline-block;
- height: 680px;
+ height: 760px;
width: 968px;
- margin: 2px 2px 2px 2px;
+ margin-top: -40px;
overflow: hidden;
z-index: 50;
+ top: -20px;
}
/* Main Navigation **************************************************/
#main-nav-background {
background: #333333; /*#15628c;*/
height: 50px;
- text-align: center;
+ text-align: center;none repeat scroll 0 0 white
vertical-align:middle;
color: white;
margin: auto; /*this will center the div on the page*/

No commit comments for this range

Something went wrong with that request. Please try again.