Permalink
Browse files

fixed subdomains

  • Loading branch information...
schadenfred committed Apr 7, 2012
1 parent a3b1db4 commit 96cab777aa91455481647f6a1ec959be910ff09d
View
@@ -85,11 +85,11 @@ group :test do
end
-platforms :ruby do
- gem 'rb-readline'
+# platforms :ruby do
+ # gem 'rb-readline'
# notification support
# gem 'rb-inotify'
# gem 'libnotify'
-end
+# end
View
@@ -36,7 +36,7 @@ GEM
jquery-rails
rails (~> 3.1)
bootstrap-forms (0.0.4)
- bootstrap-sass (2.0.1)
+ bootstrap-sass (2.0.2)
bourbon (1.4.0)
sass (>= 3.1)
builder (3.0.0)
@@ -88,10 +88,10 @@ GEM
eventmachine (0.12.10)
execjs (1.3.0)
multi_json (~> 1.0)
- factory_girl (3.0.0)
+ factory_girl (3.1.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.0.0)
- factory_girl (~> 3.0.0)
+ factory_girl_rails (3.1.0)
+ factory_girl (~> 3.1.0)
railties (>= 3.0.0)
faker (1.0.1)
i18n (~> 0.4)
@@ -119,7 +119,7 @@ GEM
guard-sass (0.5.4)
guard (>= 0.4.0)
sass (>= 3.1)
- guard-spork (0.5.2)
+ guard-spork (0.6.0)
guard (>= 0.10.0)
spork (>= 0.8.4)
haml (3.1.4)
@@ -128,8 +128,8 @@ GEM
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
- headless (0.2.2)
- heroku (2.23.0)
+ headless (0.3.1)
+ heroku (2.24.0)
launchy (>= 0.3.2)
netrc (~> 0.7.1)
rest-client (~> 1.6.1)
@@ -138,7 +138,7 @@ GEM
hpricot (0.8.6)
i18n (0.6.0)
journey (1.0.3)
- jquery-rails (2.0.1)
+ jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.6.6)
@@ -184,7 +184,6 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rb-readline (0.4.2)
rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
@@ -194,7 +193,7 @@ GEM
rspec-expectations (~> 2.9.0)
rspec-mocks (~> 2.9.0)
rspec-core (2.9.0)
- rspec-expectations (2.9.0)
+ rspec-expectations (2.9.1)
diff-lcs (~> 1.1.3)
rspec-mocks (2.9.0)
rspec-rails (2.9.0)
@@ -307,7 +306,6 @@ DEPENDENCIES
launchy
pg (= 0.12.2)
rails (= 3.2.3)
- rb-readline
rspec-rails
ruby-debug19
ruby-prof
@@ -33,212 +33,6 @@ header {
}
}
}
-/*footer {
- text-align: left;
- margin-top: 10px;
- width: 710px;
- margin-left: auto;
- margin-right: auto;
- nav {
- float: none;
- }
-}*/
-
-
-/*nav {
- float: right;
- display: inline-block;
- padding: 0 0.7em;
- padding: 10px;
- white-space: nowrap;
- font-weight: bold;
-
- ul {
- margin: 0;
- padding: 0;
- background: white;
-
- li {
- list-style-type: none;
- display: inline-block;
- padding: 0 5px;
- font-weight: bold;
- color: grey;
-
- a {
- color: #09c;
- opacity: .6;
- -moz-transition: height 1s ease-out, opacity 2s ease;
- -webkit-transition: height 2s ease-out, opacity 2s ease;
- -o-transition: height 1s ease-out, opacity 1s ease;
- transition: height 1s ease-out, opacity 1s ease;
-
- &:hover {
- text-decoration: none;
- opacity: 1;
- }
-
- &:visited {
- color: #09c;
- }
- }
- }
- }
-}
-*/
-/* links */
-
-/*a {
- color: #09c;
- text-decoration: none;
-
- &:hover {
- color: #09c;
- text-decoration: none;
- }
-
- &:visited {
- color: #09c;
- }
-}
-*/
-/*ul {
- margin-top: 2em;
- margin-bottom: 1em;
-
- li {
- list-style: none;
- }
-}
-*/
-// User show page
-
-.profile {
- width: 100%;
- margin-bottom: 0;
-}
-
-td {
- width: 710px;
-
- &.main {
- width: 65%;
- padding-right: 1em;
- }
-
- &.sidebar {
- width: 35%;
- padding: 1em;
- vertical-align: top;
- background: #ffc;
- }
-}
-
-.profile {
- img.gravatar {
- border: 1px solid #999;
- margin-bottom: -15;
- }
- td {
- margin-bottom: 15px;
- }
-}
-
-div {
- &.field, &.actions {
- margin-bottom: 10px;
- }
-}
-
-h1.thankyou {
- margin-bottom: 0.3em;
-}
-
- Thankyous
-
-table.thankyous {
- margin-top: 1em;
- tr {
- height: 70px;
- td {
- &.gravatar {
- border-top: 1px solid #ccc;
- vertical-align: top;
- width: 50px;
- }
- &.thankyou {
- border-top: 1px solid #ccc;
- vertical-align: top;
- padding-top: 10px;
-
- &.span.timestamp {
- display: block;
- font-size: 85%;
- }
- &.span.content {
- #gravatar {
- margin-bottom: -5em;
- }
- }
- }
- }
- }
-}
-
-div.user_info {
- img {
- padding-right: 0.1em;
- }
-
- a {
- text-decoration: none;
- }
-
- span {
- .user_name {
- position: absolute;
- }
-
- .thankyous {
- font-size: 80%;
- }
- }
-}
-
-form.thankyou {
- margin-bottom: 2em;
-
- textarea {
- height: 4em;
- margin-bottom: 0;
- }
-}
-
-/* Round corners */
-
-.round {
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- border-radius: 10px;
-}
-
-#flash_notice, #flash_alert {
- padding: 5px 8px;
- margin: 10px 0;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
-}
-
-#flash_notice {
- background-color: #CFC;
-}
-
-#flash_alert {
- background-color: #FCC;
-}
-
-/* Login and Signup buttons -- override Twitter bootstrap defaults */
@@ -33,19 +33,6 @@ def delete
redirect_to thankyous_url, :flash => { :notice => "Thankyou destroyed." }
end
- def thankyous
- @user = current_user
- @thankyous = @user.thankyous.page(params[:page])
- @title = "Thankyous"
-# @thankyou = Thankyou.new if signed_in?
- end
-
- def welcomes
- @user = current_user
- @welcomes = @user.welcomes.page(params[:page])
- @title = "welcomes"
-# @welcome = Welcome.new if signed_in?
- end
def show_thankyous
@user = current_user
@@ -9,4 +9,6 @@
= render 'shared/flash_messages', :locals => {:flash => flash}
= yield
= render 'layouts/footer'
+ = debug(params) if Rails.env.development?
+
@@ -1,17 +1,11 @@
%tr
- %td.thankyou
- %span.content
- #{gravatar_for thankyou.welcomer, :size => 15}
- | You wrote about #{link_to thankyou.welcomer.name, thankyou.thanker} &mdash;
- %strong
- = thankyou.headline
- "#{thankyou.content}"
- %span.timestamp
- Posted #{time_ago_in_words(thankyou.created_at)} ago.
- - thankyou.attachments.each do |attachment|
- = link_to(attachment.filename, attachment, :target => '_blank')
- |
- = link_to "edit", thankyou_edit_url(thankyou)
- |
- = link_to "delete", thankyou_delete_url(thankyou), :confirm => 'Not feeling it any more, huh?', :method => :delete
+ %td
+ #{gravatar_for thankyou.thanker, :size => 15} | You wrote about #{link_to thankyou.welcomer.name, root_url(subdomain: thankyou.welcomer.subdomain) } &mdash; #{thankyou.headline} #{thankyou.content} "Posted"
+ = time_ago_in_words(thankyou.created_at)
+ ago.
+ - thankyou.attachments.each do |attachment|
+ = link_to(attachment.filename, attachment, :target => '_blank')
+ %td
+ = link_to "edit", thankyou_edit_url(thankyou), class: "btn btn-mini btn-inverse"
+ = link_to "delete", thankyou_delete_url(thankyou), :confirm => 'Not feeling it any more, huh?', :method => :delete, class: "btn btn-mini btn-warning"
Oops, something went wrong.

0 comments on commit 96cab77

Please sign in to comment.