Update styling, mark edited journals

For #128

app/assets/stylesheets/_colours.css.scss

@@ -35,7 +35,7 @@ $play-treasure-colour: darken($treasure, 10%);
 $reaction-blue: #337;
 $buy-gold: $treasure * 0.75;
 
-$p0col: #fcc;
+$p0col: #fdb;
 $p1col: #ffd;
 $p2col: #cfc;
 $p3col: #dff;

app/assets/stylesheets/_mixins.css.scss

@@ -3,6 +3,9 @@
 $header-height: 230px;
 
 .lighter {font-weight: normal; color: #ccc;}
+.bold {font-weight: bold;}
+.red { color: red; }
+.error { background-color: lighten(red, 25%); }
 
 @mixin when-smaller-than($breakpoint) {
   @if $breakpoint == small {

app/assets/stylesheets/application.css.scss

@@ -7,8 +7,6 @@
 
 @import "form-styles";
 
-.red { color: red; }
-
 .design {
   border: 1px solid blue;
 }

app/assets/stylesheets/games.css.scss

@@ -33,7 +33,7 @@
       }
     }
 
-    .bold, .current {font-weight: bold;}
+    .current {font-weight: bold;}
 
     &.ended.rowEven {background-color: #ffe0e0;}
     &.ended.rowOdd {background-color: #fbb;}

app/controllers/journals_controller.rb

@@ -52,7 +52,7 @@ def update
     if params[:journal].andand[:event].andand.blank?
       @journal.destroy
     else
-      @journal.update(journal_params)
+      @journal.update(journal_params.merge({ modified: true }))
     end
     respond_to do |format|
         format.html { redirect_to play_game_path(@journal.game), status: :see_other }

app/models/player.rb

@@ -858,7 +858,7 @@ def draw_cards(num, reason = nil)
       else
         drawn_string << "#{cards_drawn.join(', ')}|#{cards_drawn.length} card#{cards_drawn.length == 1 ? '' : 's'}]"
       end
-raise
+
       game.add_history(:event => "#{name} drew #{drawn_string}#{reason}.",
                             :css_class => "player#{seat} card_draw #{'shuffle' if (shuffle_point > 0 && shuffle_point < cards_drawn.length)}")
     end

app/views/games/_journals.html.slim

@@ -1,17 +1,19 @@
 ul
   - @game.journals.each do |journal|
-    li.journal class=('red' if journal.errors.any?)
+    li.journal class=('error' if journal.errors.any?)
+      - if journal.modified
+        span.bold>[] (Edited)
       - if journal.player == @player && journal.order > @game.last_blocked_journal
         span.insert data-order=journal.order
         = best_in_place journal, :event, class: 'change_journal', other_fields: {game_id: @game.id}, html_attrs: {style: 'width: 100%', autocomplete: 'off'}
       - else
         span.immutable= journal.event
-    -if journal.errors.any?
-      ul.journal_errors
-        - journal.errors.full_messages.each do |msg|
-          li= msg
-    - journal.histories.each do |history|
-      - classes = history.css_class
-      - if @player && history.css_class =~ /\bplayer#{@player.seat}\b/
-        - classes += ' self'
-      li class=classes = format_history(history, @player)
+      -if journal.errors.any?
+        ul.journal_errors.error
+          - journal.errors.full_messages.each do |msg|
+            li= msg
+      - journal.histories.each do |history|
+        - classes = history.css_class
+        - if @player && history.css_class =~ /\bplayer#{@player.seat}\b/
+          - classes += ' self'
+        li class=classes = format_history(history, @player)

db/migrate/20160312145617_add_modified_to_journals.rb

@@ -0,0 +1,5 @@
+class AddModifiedToJournals < ActiveRecord::Migration
+  def change
+    add_column :journals, :modified, :boolean, default: false
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160202160833) do
+ActiveRecord::Schema.define(version: 20160312145617) do
 
   create_table "chats", force: true do |t|
     t.integer  "game_id"
@@ -37,6 +37,7 @@
     t.text     "event"
     t.datetime "created_at"
     t.integer  "order"
+    t.boolean  "modified",   default: false
   end
 
   add_index "journals", ["game_id"], name: "index_journals_on_game_id"