diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 62a5c868e8278a1c0b60dd7821774e4521673cac..f1c072837a933cd2b7adfbb2cfdf67146b29a289 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,3 +12,23 @@ *= require bootstrap *= require_tree . */ + +.quest-button, .reward-button{ + white-space: normal !important; +} + +.reward-button{ + min-height: 91px; +} + +.hacker-flair, .btn{ +/* margin-left: 5px; */ +} + +.hacker-flair:first, .btn:first{ + margin-left: 0px !important; +} + +.btn-danger a{ + color: #FFF; +} diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e4e8f2081b9e487384248710c45c39aa86b79ed1..1061f54acd09f268ddb0abc11f19ce3532ea5365 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -10,7 +10,7 @@ module ApplicationHelper if current_hacker.blank? link_to 'Einloggen', new_hacker_session_path else - current_hacker.nickname + link_to current_hacker.nickname, current_hacker end end end diff --git a/app/views/chronicles/_earning.html.erb b/app/views/chronicles/_earning.html.erb index 757eee4911077f5660a44bb71756f3459cdfb04e..5e22c74991a5429fa89bfb4166e1b4b6cddc6668 100644 --- a/app/views/chronicles/_earning.html.erb +++ b/app/views/chronicles/_earning.html.erb @@ -9,7 +9,7 @@ <%= entry.chronicle_text %> <% if entry.cancel.blank? %> - + <%= link_to 'Storno', cancel_earning_path(entry), :method => :post %> <% end %> diff --git a/app/views/chronicles/_redemption.html.erb b/app/views/chronicles/_redemption.html.erb index 055c8e4e862af9d8b5e1916e706ca5ca9a0a9bb9..30493fccdfb49feee9764d21f3ada8cc1e65ddb0 100644 --- a/app/views/chronicles/_redemption.html.erb +++ b/app/views/chronicles/_redemption.html.erb @@ -1,6 +1,5 @@
- - + +<%= entry.points %> @@ -10,7 +9,7 @@ <%= entry.chronicle_text %> <% if entry.cancel.blank? %> - + <%= link_to 'Storno', cancel_redemption_path(entry), :method => :post %> <% end %> diff --git a/app/views/hackers/_hacker.html.erb b/app/views/hackers/_hacker.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..71cf14682e0f204bef4c240ceef99fb1f8af0468 --- /dev/null +++ b/app/views/hackers/_hacker.html.erb @@ -0,0 +1,20 @@ + +
+
+
+ <%= image_tag gravatar_url_for(hacker.email, 80) %> +
+
+ <%= hacker.nickname %> +
+ + <%= hacker.recent_earned_points %> + +
+ + <%= hacker.all_earned_points %> + +
+
+
+ diff --git a/app/views/hackers/_quests.html.erb b/app/views/hackers/_quests.html.erb index 47690a986d43ddeaa9f33bef7823070bc1098e8b..1d79dd0beb5ae191359da3bf5eb6e5bb3ee85a41 100644 --- a/app/views/hackers/_quests.html.erb +++ b/app/views/hackers/_quests.html.erb @@ -1,17 +1,9 @@ - <% quests.in_groups_of(10) do |grouped_quests| %>
- <% grouped_quests.each do |quest| %> - <% if quest.present? %> -
-

- <%= quest.title %> -

- - - <%= quest.points %> -
- <% end %> - <% end %> + <%= render({ + :partial => 'hackers/quests/show', + :collection => grouped_quests.compact, + :as => :quest + }) %>
<% end %> diff --git a/app/views/hackers/_rewards.html.erb b/app/views/hackers/_rewards.html.erb index 6b6ccc0dbad15b1c6fa5a6062e8ccc4be5c8fb4a..cdc8c4e2f7b77992be9b4530baa50fb48f6dacd9 100644 --- a/app/views/hackers/_rewards.html.erb +++ b/app/views/hackers/_rewards.html.erb @@ -1,18 +1,9 @@ - - <% rewards.in_groups_of(10) do |grouped_rewards| %>
- <% grouped_rewards.each do |reward| %> - <% if reward.present? %> -
-

- <%= reward.title %> -

- - - <%= reward.points %> -
- <% end %> - <% end %> + <%= render({ + :partial => 'hackers/rewards/show', + :collection => grouped_rewards.compact, + :as => :reward + }) %>
<% end %> diff --git a/app/views/hackers/chronicle/_redemption_cancel.html.erb b/app/views/hackers/chronicle/_redemption_cancel.html.erb index 3cbb66b5821bef72ebb0738193449866d6d543a6..e159cb7dabc7309101739c4be8061d59941cc662 100644 --- a/app/views/hackers/chronicle/_redemption_cancel.html.erb +++ b/app/views/hackers/chronicle/_redemption_cancel.html.erb @@ -1,6 +1,5 @@
- - + <%= entry.points %> diff --git a/app/views/hackers/index.html.erb b/app/views/hackers/index.html.erb index 4bde41c818d94eaae997fa141deb39f517085684..a2b556b247c081fac3036b8b9aa12498b2067063 100644 --- a/app/views/hackers/index.html.erb +++ b/app/views/hackers/index.html.erb @@ -4,29 +4,15 @@
  • nickname
    • - -<% @hackers.in_groups_of(5) do |hackers| %> -
    - <% hackers.each do |hacker| %> - <% if hacker.present? %> - -
    - <%= image_tag gravatar_url_for(hacker.email) %> - <%= hacker.nickname %> -
    - - <%= hacker.recent_earned_points %> - -
    - - <%= hacker.all_earned_points %> - -
    -     - <% else %> - - <% end %> - <% end %> -
    -<% end %> +
    + <% @hackers.in_groups_of(5) do |hackers| %> +
    + <%= render({ + :partial => 'hacker', + :collection => hackers.compact, + :as => :hacker + }) %> +
    + <% end %> +
    diff --git a/app/views/hackers/quests/_show.html.erb b/app/views/hackers/quests/_show.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..e7396e11c70030a47d695078085a08734003d703 --- /dev/null +++ b/app/views/hackers/quests/_show.html.erb @@ -0,0 +1,14 @@ +
    +
    +
    + + +
    +
    + <%= quest.title %> +
    +
    + <%= quest.points %> +
    +
    +
    diff --git a/app/views/hackers/rewards/_show.html.erb b/app/views/hackers/rewards/_show.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..b32746d6e13eb786aa93039fe5642c342a52a614 --- /dev/null +++ b/app/views/hackers/rewards/_show.html.erb @@ -0,0 +1,14 @@ +
    +
    +
    + + +
    +
    + <%= reward.title %> +
    +
    + <%= reward.points %> +
    +
    +
    diff --git a/app/views/hackers/show.html.erb b/app/views/hackers/show.html.erb index c659b159a21acbe4a13d1f7482b0a2b6b0ea57cb..e60384b3e5f8e700c63e4041d53dc4e5ca1683b9 100644 --- a/app/views/hackers/show.html.erb +++ b/app/views/hackers/show.html.erb @@ -1,5 +1,5 @@
    - <%= image_tag(gravatar_url_for(@hacker.email)) %> <%= @hacker.nickname %> +

    <%= image_tag(gravatar_url_for(@hacker.email)) %> <%= @hacker.nickname %>

    @@ -32,10 +32,16 @@

    Punkte erarbeitet

    -<%= render :partial => 'quests', :locals => {:quests => @quests} %> +
    + <%= render :partial => 'quests', :locals => {:quests => @quests} %> +

    Punkte einlösen

    -<%= render :partial => 'rewards', :locals => {:rewards => @rewards} %> +
    + <%= render :partial => 'rewards', :locals => {:rewards => @rewards} %> +

    Verlauf

    -<%= render :partial => 'chronicle', :locals => {:chronicle => @chronicle} %> +
    + <%= render :partial => 'chronicle', :locals => {:chronicle => @chronicle} %> +
    diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 484ed34584fb5cad680eb81f253c1021d6063f46..2b6c5897fc4b237e2d03227144d4b3f26be08bdc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,19 +1,32 @@ - - SpacePoints - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - <%= csrf_meta_tags %> - - - -
    - <%= yield %> -
    + + SpacePoints + <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> + <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + <%= csrf_meta_tags %> + + + +
    + <%= yield %> +
    - <%= login_or_username %> | <%= link_to 'Historie', chronicle_path %> - +

     

    + +
    + + diff --git a/spec/factories/redeptions.rb b/spec/factories/redeptions.rb deleted file mode 100644 index 0f15604497a4acbfaa1df629e8d89ebb52dcb6da..0000000000000000000000000000000000000000 --- a/spec/factories/redeptions.rb +++ /dev/null @@ -1,8 +0,0 @@ -FactoryGirl.define do - factory :redemption do - points { [1,10,50,150].shuffle.first} - association :hacker, :factory => :hacker - association :user, :factory => :hacker - association :reward, :factory => :reward - end -end