card 1.19.6 → 1.20.0

data/mod/history/set/all/history.rb

@@ -11,8 +11,7 @@ def actionable?
   history? || respond_to?(:attachment)
 end
 
-event :assign_action, :initialize,
-      when: proc { |c| c.actionable? } do
+event :assign_action, :initialize, when: proc { |c| c.actionable? } do
   @current_act = director.need_act
   @current_action = Card::Action.create(
     card_act_id: @current_act.id,
@@ -24,14 +23,9 @@ event :assign_action, :initialize,
   end
 end
 
-def finalize_action?
-  actionable? && current_action
-end
-
 # stores changes in the changes table and assigns them to the current action
 # removes the action if there are no changes
-event :finalize_action, :finalize,
-      when: proc { |c| c.finalize_action? } do
+event :finalize_action, :finalize, when: :finalize_action? do
   @changed_fields = Card::Change::TRACKED_FIELDS.select do |f|
     changed_attributes.member? f
   end
@@ -49,6 +43,10 @@ event :finalize_action, :finalize,
   end
 end
 
+def finalize_action?
+  actionable? && current_action
+end
+
 event :finalize_act,
       after: :finalize_action,
       when: proc { |c|  c.act_card? } do
@@ -65,9 +63,8 @@ def act_card?
   self == Card::ActManager.act_card
 end
 
-event :rollback_actions, :prepare_to_validate,
-      on: :update,
-      when: proc { |c| c.rollback_request? } do
+event :rollback_actions,
+      :prepare_to_validate, on: :update, when: :rollback_request? do
   revision = { subcards: {} }
   rollback_actions = Env.params["action_ids"].map do |a_id|
     Action.fetch(a_id) || nil
@@ -81,10 +78,6 @@ event :rollback_actions, :prepare_to_validate,
   end
   Env.params["action_ids"] = nil
   update_attributes! revision
-  rollback_actions.each do |action|
-    # rollback file and image cards
-    action.card.try :rollback_to, action
-  end
   clear_drafts
   abort :success
 end
@@ -137,277 +130,70 @@ def included_descendant_card_ids
 end
 
 format :html do
-  view :history do |args|
-    frame args.merge(body_class: "history-slot list-group", content: true) do
-      [history_legend, _render_act_list]
-    end
-  end
-
-  def default_history_args args
-    args[:optional_toolbar] ||= :show
-  end
-
-  view :act_list do |args|
-    page = params["page"] || 1
-    count = card.intrusive_acts.size + 1 - (page.to_i - 1) * ACTS_PER_PAGE
-    card.intrusive_acts.page(page).per(ACTS_PER_PAGE).map do |act|
-      count -= 1
-      render_act args.merge(act: act, act_seq: count)
-    end.join
-  end
-
-  def history_legend
-    intr = card.intrusive_acts.page(params["page"]).per(ACTS_PER_PAGE)
-    render_haml intr: intr do
-      <<-HAML.strip_heredoc
-        .history-header
-          %span.slotter
-            = paginate intr, remote: true, theme: 'twitter-bootstrap-3'
-          %div.history-legend
-            = glyphicon "plus-sign", "added-mark"
-            %span
-              = Card::Content::Diff.render_added_chunk('Added')
-              |
-            = glyphicon "minus-sign", "deleted-mark"
-            %span
-              = Card::Content::Diff.render_deleted_chunk('Removed')
-              |
-            = glyphicon "trash", "deleted-mark"
-            %span
-              card deleted
-      HAML
-    end
-  end
-
-  def default_act_args args
-    act = (args[:act]  ||= Act.find(params["act_id"]))
-    args[:act_seq]     ||= params["act_seq"]
-    args[:hide_diff]   ||= hide_diff?
-    args[:slot_class]  ||= "revision-#{act.id} history-slot list-group-item"
-    args[:action_view] ||= action_view
-    args[:actions]     ||= action_list args
-  end
-
-  def action_list args
-    act = args[:act]
-    actions =
-      if act_context(args) == :absolute
-        act.actions
-      else
-        act.actions_affecting(card)
+  view :history, cache: :never do
+    voo.show :toolbar
+    class_up "card-body",  "history-slot"
+    frame do
+      bs_layout container: true, fluid: true do
+        html _optional_render_history_legend(with_drafts: true)
+        row 12 do
+          html _render_act_list acts: history_acts
+        end
+        row 12 do
+          col act_paging
+        end
       end
-    actions.select { |a| a.card && a.card.ok?(:read) }
-    # FIXME: should not need to test for presence of card here.
-  end
-
-  def act_context args
-    args[:act_context] =
-      (args[:act_context] || params["act_context"] || :relative).to_sym
-  end
-
-  def hide_diff?
-    params["hide_diff"].to_s.strip == "true"
-  end
-
-  def action_view
-    (params["action_view"] || "summary").to_sym
-  end
-
-  view :act do |args|
-    wrap(args) do
-      render_haml args.merge(card: card, args: args) do
-        <<-HAML.strip_heredoc
-          .act{style: "clear:both;"}
-            - show_header = act_context == :absolute ? :show : :hide
-            = optional_render :act_header, args, show_header
-            .head
-              = render :act_metadata, args
-            .toggle
-              = fold_or_unfold_link args
-            .action-container
-              - actions.each do |action|
-                = render "action_#{args[:action_view]}", args.merge(action: action)
-        HAML
-      end
-    end
-  end
-
-  view :act_header do |_args|
-    %(<h5 class="act-header">#{link_to_card card}</h5>)
-  end
-
-  view :act_metadata do |args|
-    render_haml args.merge(card: card, args: args) do
-      <<-HAML.strip_heredoc
-        - unless act_context == :absolute
-          .nr
-            = '#' + act_seq.to_s
-        .title
-          .actor
-            = link_to_card act.actor
-          .time.timeago
-            = time_ago_in_words(act.acted_at)
-            ago
-            - if act.id == card.last_act.id
-              %em.label.label-info Current
-            - if action_view == :expanded
-              - unless act.id == card.last_act.id
-                = rollback_link act.actions_affecting(card)
-              = show_or_hide_changes_link args
-      HAML
     end
   end
 
-  view :action_summary do |args|
-    view_action :summary, args
-  end
-
-  view :action_expanded do |args|
-    view_action :expanded, args
-  end
-
-  def view_action action_view, args
-    action = args[:action] || card.last_action
-    hide_diff = args[:hide_diff] || hide_diff?
-    return trashed_view(action) if action.action_type == :delete
-    render_haml action: action,
-                action_view: action_view,
-                name_diff: name_diff(action, hide_diff),
-                type_diff: type_diff(action, hide_diff),
-                content_diff: content_diff(action, action_view, hide_diff) do
-      <<-HAML.strip_heredoc
-        .action
-          .summary
-            %span.ampel
-              = glyphicon 'minus-sign', (action.red? ? 'deleted-mark' : 'diff-invisible')
-              = glyphicon 'plus-sign', (action.green? ? 'added-mark' : 'diff-invisible')
-            = wrap_diff :name, name_diff
-            = wrap_diff :type, type_diff
-            -if content_diff && action_view == :summary
-              = glyphicon 'arrow-right', 'arrow'
-              = wrap_diff :content, content_diff
-          -if content_diff and action_view == :expanded
-            .expanded
-              = wrap_diff :content, content_diff
-      HAML
+  view :history_legend do |args|
+    bs_layout do
+      row md: [12, 12], lg: [7, 5] do
+        col action_legend(args[:with_drafts])
+        col content_legend, class: "text-right"
+      end
     end
   end
 
-  def trashed_view action
-    render_haml action: action do
-      <<-HAML.strip_heredoc
-        .action
-          .summary
-            %span.ampel
-              = glyphicon 'trash', 'deleted-mark'
-            = wrap_diff :name, action.card.name, ('label label-default' if action.card != card)
-      HAML
-    end
+  def history_acts
+    card.intrusive_acts.page(page_from_params).per(ACTS_PER_PAGE)
   end
 
-  def name_diff action, hide_diff
-    working_name = name_changes action, hide_diff
-    if action.card == card
-      working_name
-    else
-      link_to_view(
-        :related, working_name,
-        path: { related: { view: "history", name: action.card.name } },
-        remote: true,
-        class: "slotter label label-default",
-        "data-slot-selector" => ".card-slot.history-view"
-      )
+  def act_paging
+    intrusive_acts = card.intrusive_acts
+                         .page(page_from_params).per(ACTS_PER_PAGE)
+    wrap_with :span, class: "slotter" do
+      paginate intrusive_acts, remote: true, theme: 'twitter-bootstrap-3'
     end
   end
 
-  def type_diff action, hide_diff
-    action.new_type? && type_changes(action, hide_diff)
+  def page_from_params
+    params["page"] || 1
   end
 
-  def content_diff action, action_view, hide_diff
-    diff = action.new_content? &&
-           action.card.format.render_content_changes(
-             action: action, diff_type: action_view, hide_diff: hide_diff
-           )
-    return "<i>empty</i>" unless diff.present?
-    diff
+  def action_legend with_drafts=true
+    types = [:create, :update, :delete]
+    legend = types.map do |action_type|
+               "#{action_icon(action_type)} #{action_type}d"
+             end
+    legend << "#{action_icon(:draft)} unsaved draft" if with_drafts
+    "<small>Actions: #{legend.join ' | '}</small>"
   end
 
-  def wrap_diff field, content, extra_class=nil
-    return "" unless content.present?
-    %(
-       <span class="#{field}-diff #{extra_class}">
-       #{content}
-       </span>
-    )
-  end
-
-  def name_changes action, hide_diff=false
-    old_name = (name = action.previous_value :name) && showname(name).to_s
-    if action.new_name?
-      new_name = showname(action.value(:name)).to_s
-      if hide_diff
-        new_name
-      else
-        Card::Content::Diff.complete(old_name, new_name)
-      end
-    else
-      old_name
-    end
-  end
-
-  def type_changes action, hide_diff=false
-    change = hide_diff ? action.value(:cardtype) : action.cardtype_diff
-    "(#{change})"
+  def content_legend
+    legend = [Card::Content::Diff.render_added_chunk('Additions'),
+              Card::Content::Diff.render_deleted_chunk('Subtractions')]
+    "<small>Content changes: #{legend.join ' | '}</small>"
   end
 
   view :content_changes do |args|
+    action = args[:action]
     if args[:hide_diff]
-      args[:action].raw_view
+      action.raw_view
     else
-      args[:action].content_diff(args[:diff_type])
+      action.content_diff(args[:diff_type])
     end
   end
-
-  def fold_or_unfold_link args
-    act_id = args[:act].id
-    action_view = args[:action_view] == :expanded ? :summary : :expanded
-    arrow_dir = args[:action_view] == :expanded ? "arrow-down" : "arrow-right"
-
-    link_to_view :act, "", class: "slotter revision-#{act_id} #{arrow_dir}",
-                           path: { act_id:      act_id,
-                                   act_seq:     args[:act_seq],
-                                   hide_diff:   args[:hide_diff],
-                                   act_context: args[:act_context],
-                                   action_view: action_view,
-                                   look_in_trash: true }
-  end
-
-  def rollback_link actions
-    # FIXME -- doesn't this need to specify which action it wants?
-    prior =  # FIXME - should be a Card::Action method
-      actions.select { |action| action.card.last_action_id != action.id }
-    return unless card.ok?(:update) && prior.present?
-    link = link_to(
-      "Save as current", class: "slotter",
-                         "data-slot-selector" => ".card-slot.history-view",
-                         remote: true, method: :post, rel: "nofollow",
-                         path: { action: :update, action_ids: prior,
-                                 view: :open, look_in_trash: true }
-    )
-    %(<div class="act-link">#{link}</div>)
-  end
-
-  def show_or_hide_changes_link args
-    link = link_to_view(
-      :act, "#{args[:hide_diff] ? 'Show' : 'Hide'} changes",
-      class: "slotter",
-      path: { act_id:      args[:act].id,      act_seq: args[:act_seq],
-              hide_diff:  !args[:hide_diff],   action_view: :expanded,
-              act_context: args[:act_context], look_in_trash: true }
-    )
-    %(<div class="act-link">#{link}</div>)
-  end
 end
 
 def diff_args

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -507,122 +507,14 @@ ul.pointer {
 /*- HISTORY          - */
 /*-------------------- */
 
-
-
 $diff-green: #41ad41;
 $diff-red: #ff5050;
-$action-white: #fdfdfd;
-$act-gray:  #b7b7b7;
 
 .history-slot {
   overflow: hidden;
   clear: both;
 }
 
-.history-header {
-  padding: 10px;
-  background: $action-white;
-}
-.history-legend {
-  text-align: right;
-}
-.history-header nav.pagination {
-  display: inline;
-  float: left;
-}
-
-.act {
-  .head {
-    float: left;
-    margin-right:10px;
-    min-width: 175px;
-  }
-  .nr {
-    float: left;
-  }
-  .title {
-    float: left;
-    margin-left: 10px;
-  }
-  .actor {
-    float: left;
-  }
-  .time {
-    font-size: 8pt;
-    float:left;
-    clear:left;
-  }
-
-  .action-container {
-    overflow: hidden;
-  }
-  .action {
-    background-color: $action-white;
-    margin: 5px 5px 2px 2px;
-    padding: 6px 5px 6px 5px;
-    overflow: hidden;
-  }
-  .ampel {
-    margin: 2px 0 0 4px;
-  }
-  .arrow {
-    margin: 0px 10px 0px 10px;
-    color: green;
-  }
-  .toggle {
-    float: right;
-    margin: 12px 10px 0px 10px;
-    width: 20px;
-  }
-/*
-  .name-diff {
-    color: #000;
-    border-style: solid;
-    border-width: 1px;
-    border-color: #E4E4E4;
-    padding: 3px 8px 3px 8px;
-    background-color: #EEEEEE;
-    margin-left: 3px;
-  }
-*/
-  .type-diff {
-    padding: 1px 0px 1px 3px;
-  }
-  .content-diff {
-    overflow: hidden;
-  }
-
-  .action {
-    .expanded {
-      clear:left;
-      padding: 14px 10px 14px 24px;
-    }
-    .summary {
-      padding: 6px 0px;
-    }
-  }
-
-  .arrow-down {
-  	width: 0;
-  	height: 0;
-  	border-left: 7px solid transparent;
-  	border-right: 7px solid transparent;
-  	border-top: 11px solid $act-gray;
-    display: block;
-  }
-  .arrow-right {
-  	width: 0;
-  	height: 0;
-  	border-top: 7px solid transparent;
-  	border-bottom: 7px solid transparent;
-  	border-left: 11px solid $act-gray;
-    display: block;
-  }
-  .info {
-    font-style: italic;
-  }
-}
-
 .deleted-mark {
   color: $diff-red;
 }
@@ -645,14 +537,33 @@ $act-gray:  #b7b7b7;
     border: 2px solid $diff-green;
   }
 }
-.diff-invisible {
-  color: $action-white;
-}
 
-.diff-green,.diff-invisible{
-  text-decoration: none;
-}
+ul.action-list {
+  list-style-type: none;
+  padding-left: 15px;
+  li:before {
+    font-family: 'Glyphicons Halflings';
+    float: left;
+    margin-top: 4px;
+    margin-left: -17px;
+  }
 
+  li.update:before {
+    content: "\270f";
+  }
+
+  li.create:before {
+    content: "\2b";
+  }
+
+  li.delete:before {
+    content: "\e020";
+  }
+
+  li.draft:before {
+    content: "\e136";
+  }
+}
 
 
 /*-------------------- */
@@ -822,7 +733,7 @@ td.rule-setting {
     margin: 0;
   }
 }
-td.missing-rule {
+tr.missing-rule > td {
   background-color: #eee;
   border-bottom: 1px solid #fff;
 }
@@ -892,6 +803,10 @@ h2.set-label {
 
 /*------- permissions ------------------*/
 
+.perm-editor {
+  margin-left: 40px;
+}
+
 .perm-section {
   margin-bottom: 20px;
 }