Commit 6adbff04ba9211470f89501dcab04b645e80bce6
1 parent
ad887e18
Exists in
master
and in
28 other branches
Added tip on template on signup
Showing
2 changed files
with
4 additions
and
8 deletions
Show diff stats
app/helpers/application_helper.rb
@@ -1340,7 +1340,8 @@ module ApplicationHelper | @@ -1340,7 +1340,8 @@ module ApplicationHelper | ||
1340 | content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1)) | 1340 | content_tag('li', labelled_radio_button(link_to(template.name, template.url, :target => '_blank'), "#{field_name}[template_id]", template.id, counter==1)) |
1341 | end.join("\n") | 1341 | end.join("\n") |
1342 | 1342 | ||
1343 | - content_tag('div', content_tag('label', _('Template'), :for => 'template-options', :class => 'formlabel') + | 1343 | + content_tag('div', content_tag('label', _('Profile organization'), :for => 'template-options', :class => 'formlabel') + |
1344 | + content_tag('p', _('Your profile will be created according to the selected template. Click on the options to view them'), :style => 'margin: 5px 15px;padding: 0px 10px;') + | ||
1344 | content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'), | 1345 | content_tag('ul', radios, :style => 'list-style: none; padding-left: 20px; margin-top: 0.5em;'), |
1345 | :id => 'template-options', | 1346 | :id => 'template-options', |
1346 | :style => 'margin-top: 1em' | 1347 | :style => 'margin-top: 1em' |
public/stylesheets/application.css
@@ -5597,7 +5597,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -5597,7 +5597,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
5597 | #email-check, | 5597 | #email-check, |
5598 | #fake-check, | 5598 | #fake-check, |
5599 | #password-check { | 5599 | #password-check { |
5600 | - margin: -2px 176px -5px 13px; | 5600 | + margin: -2px 16px -5px 13px; |
5601 | text-align: right; | 5601 | text-align: right; |
5602 | clear: both; | 5602 | clear: both; |
5603 | } | 5603 | } |
@@ -5653,11 +5653,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -5653,11 +5653,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
5653 | -webkit-border-radius: 8px; | 5653 | -webkit-border-radius: 8px; |
5654 | margin: 60px auto 5px; | 5654 | margin: 60px auto 5px; |
5655 | position: relative; | 5655 | position: relative; |
5656 | - width: 563px; | ||
5657 | -} | ||
5658 | - | ||
5659 | -#signup-form #signup-form-profile { | ||
5660 | - width: 563px; | ||
5661 | } | 5656 | } |
5662 | 5657 | ||
5663 | #signup-form input.invalid_input { | 5658 | #signup-form input.invalid_input { |
@@ -5847,7 +5842,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -5847,7 +5842,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
5847 | background: transparent url(/images/orange-balloon.png) bottom center no-repeat; | 5842 | background: transparent url(/images/orange-balloon.png) bottom center no-repeat; |
5848 | position: absolute; | 5843 | position: absolute; |
5849 | z-index: 2; | 5844 | z-index: 2; |
5850 | - right: 10px; | 5845 | + right: -150px; |
5851 | } | 5846 | } |
5852 | 5847 | ||
5853 | #signup-form small#signup-balloon { | 5848 | #signup-form small#signup-balloon { |