Various small bug fixes
8 gewijzigde bestanden met toevoegingen van 10 en 5 verwijderingen
+ 1
- 1
app/views/missions/_form.html.erb
@@ -6,7 +6,7 @@ |
||
| 6 | 6 |
<%= content_tag(:div, class: "panel-text") do %> |
| 7 | 7 |
<%= content_tag(:div, class: "form-inputs") do %> |
| 8 | 8 |
<%= f.text_field :title, label: (t 'mission_editor.mission_details.mission_title'), class: 'input-block-level' %> |
| 9 |
- <% f.text_field :objective, label: (t 'mission_editor.mission_details.mission_objective'), class: 'input-block-level' %> |
|
| 9 |
+ <%= f.text_field :objective, label: (t 'mission_editor.mission_details.mission_objective'), class: 'input-block-level' %> |
|
| 10 | 10 |
<%= f.text_area :briefing, label: (t 'mission_editor.mission_details.mission_briefing'), class: 'input-block-level', rows: 10 %> |
| 11 | 11 |
<%= f.select :language, [[(t 'mission_editor.mission_details.en'), 'en'], [(t 'mission_editor.mission_details.pt-BR'), 'pt-BR']], { label: (t 'mission_editor.mission_details.language') }, { class: "selectpicker" } %>
|
| 12 | 12 |
<%= render :partial => 'mission_image_uploader', locals: { mission: @mission, f: f } %>
|
+ 1
- 1
app/views/missions/_mission_details.html.erb
@@ -18,7 +18,7 @@ |
||
| 18 | 18 |
<% end %> |
| 19 | 19 |
<%= content_tag(:div, class: 'row') do %> |
| 20 | 20 |
<%= content_tag(:div, class: 'span8') do %> |
| 21 |
- <% if !@mission.video.empty? %> |
|
| 21 |
+ <% if @mission.video != nil %> |
|
| 22 | 22 |
<%= content_tag(:div, class: "videoWrapper") do %> |
| 23 | 23 |
<iframe width="1280" height="720" src="https://www.youtube.com/embed/<%= @mission.video[/(?<=[?&]v=)[^&$]+/] %>?showinfo=0" frameborder="0" allowfullscreen></iframe> |
| 24 | 24 |
<% end %> |
+ 1
- 1
app/views/missions/show_agent_details.html.erb
@@ -57,7 +57,7 @@ |
||
| 57 | 57 |
<% end %> |
| 58 | 58 |
<%= content_tag(:div, '', class: 'clearfix') %> |
| 59 | 59 |
<%= content_tag(:div, class: 'mission-agent-bio') do %> |
| 60 |
- <%= content_tag(:p, 'Hacker from São Paulo Brazil. Avalanche programer and Designer.', class: 'agent-description') %> |
|
| 60 |
+ <%= content_tag(:p, (@agent.user.bio != nil ? @agent.user.bio : (t 'agent.empty_description')), class: 'agent-description') %> |
|
| 61 | 61 |
<% end %> |
| 62 | 62 |
<% end %> |
| 63 | 63 |
<% else %> |
+ 1
- 1
config/locales/email.en.yml
@@ -29,7 +29,7 @@ en: |
||
| 29 | 29 |
invite_email: |
| 30 | 30 |
email_subject: 'Join the Avalanche' |
| 31 | 31 |
welcome: 'Join the Avalanche' |
| 32 |
- welcome_text: 'Hello <b>%{email}</b>.<br> You have been invited by <b>%{from}</b> to join the <a href="http://avalanche.network">Avalanche Network</a>! Follow this email to get started.'
|
|
| 32 |
+ welcome_text: 'You have been invited by <b>%{from}</b> to join the <b><a href="http://avalanche.network">Avalanche Network</a></b>! Follow this email to get started.'
|
|
| 33 | 33 |
welcome_text_simple_1: 'Hello %{email}.'
|
| 34 | 34 |
welcome_text_simple_2: 'You have been invited by %{from} to join the Avalanche Network!'
|
| 35 | 35 |
welcome_text_simple_3: 'Follow this email to get started.' |
+ 1
- 1
config/locales/email.pt-BR.yml
@@ -29,7 +29,7 @@ pt-BR: |
||
| 29 | 29 |
invite_email: |
| 30 | 30 |
email_subject: 'Participe da Avalanche' |
| 31 | 31 |
welcome: 'Participe da Avalanche' |
| 32 |
- welcome_text: 'Olá <b>%{email}</b>.<br>Você foi convidado por <b>%{from}</b> para participar do <a href="http://avalanche.network">Avalanche Network</a>! Siga este email para começar.'
|
|
| 32 |
+ welcome_text: 'Você foi convidado por <b>%{from}</b> para participar do <a href="http://avalanche.network">Avalanche Network</a>! Siga este email para começar.'
|
|
| 33 | 33 |
welcome_text_simple_1: 'Olá %{email}.'
|
| 34 | 34 |
welcome_text_simple_2: 'Você foi convidado por %{from} para participar do Avalanche Network!'
|
| 35 | 35 |
welcome_text_simple_3: 'Siga este email para começar.' |
+ 3
- 0
config/locales/mission.en.yml
@@ -21,8 +21,10 @@ en: |
||
| 21 | 21 |
view_next_step: 'View Next Step' |
| 22 | 22 |
review_step: 'Review Step' |
| 23 | 23 |
agent: |
| 24 |
+ agent: 'Agent' |
|
| 24 | 25 |
dashboard: 'Dashboard' |
| 25 | 26 |
account: 'Account' |
| 27 |
+ empty_description: 'No user desciption' |
|
| 26 | 28 |
mission_control: |
| 27 | 29 |
no_submissions_yet: "No step submissions yet.<br>Wait for agents to complete some tasks." |
| 28 | 30 |
mission_editor: |
@@ -41,6 +43,7 @@ en: |
||
| 41 | 43 |
pt-BR: 'Portuguese' |
| 42 | 44 |
mission_duration: 'Mission Duration' |
| 43 | 45 |
duration: 'Type in a number' |
| 46 |
+ mission_objective: 'Short mission description' |
|
| 44 | 47 |
mission_details_help_title: 'Mission Details' |
| 45 | 48 |
mission_details_help: '<p>Fill out all the basic mission details. The video is not necessary.</p><p>Give your mission a good descriptive title.</p><p>What is going to be achieved in this mission? Write that as the mission obective.</p><p>Missions are going to be filtered to users based on their language settings.</p><p>Paste the URL of a youtube or vimeo video for your mission briefing. Make it 1-5 minutes long, tell about the mission objective, the briefing, the timetable, what agents the mission needs, what are they going to have to do and the rewards. Make it personal. Give a good cause for your mission.</p><p>In the mission briefing, tell the agents how things are going to work out during the mission. You dont have to be specific here, but try to tell everyone what is going to happen and a summary of what each agent is going to do.</p><p>After completing the form, save and continue to add rewards and agents to the mission.</p><p>Before the mission is launched, only the you can see the mission and edit its content. After the mission is launched, most of the mission details wont be able to be edited.</p>' |
| 46 | 49 |
rewards: |
+ 2
- 0
config/locales/mission.pt-BR.yml
@@ -23,6 +23,7 @@ pt-BR: |
||
| 23 | 23 |
agent: |
| 24 | 24 |
dashboard: 'Painel' |
| 25 | 25 |
account: 'Conta' |
| 26 |
+ empty_description: 'Sem descrição.' |
|
| 26 | 27 |
mission_editor: |
| 27 | 28 |
continue_later: 'continuar depois' |
| 28 | 29 |
launch_mission: 'Lançar Missão' |
@@ -39,6 +40,7 @@ pt-BR: |
||
| 39 | 40 |
pt-BR: 'Português' |
| 40 | 41 |
mission_duration: 'Tempo de duração da missão' |
| 41 | 42 |
duration: 'Digite um número...' |
| 43 |
+ mission_objective: 'Descrição curta da missão' |
|
| 42 | 44 |
mission_details_help_title: 'Mission Details' |
| 43 | 45 |
mission_details_help: '<p>Fill out all the basic mission details. The video is not necessary.</p><p>Give your mission a good descriptive title.</p><p>What is going to be achieved in this mission? Write that as the mission obective.</p><p>Missions are going to be filtered to users based on their language settings.</p><p>Paste the URL of a youtube or vimeo video for your mission briefing. Make it 1-5 minutes long, tell about the mission objective, the briefing, the timetable, what agents the mission needs, what are they going to have to do and the rewards. Make it personal. Give a good cause for your mission.</p><p>In the mission briefing, tell the agents how things are going to work out during the mission. You dont have to be specific here, but try to tell everyone what is going to happen and a summary of what each agent is going to do.</p><p>After completing the form, save and continue to add rewards and agents to the mission.</p><p>Before the mission is launched, only the you can see the mission and edit its content. After the mission is launched, most of the mission details wont be able to be edited.</p>' |
| 44 | 46 |
rewards: |