tawork 0.0.38 → 0.0.39

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjlkOGRmODk5MDg2NjVhMjA3MDhmYzZiYWI3NTBhM2QyZjlhOGI4NQ==
+    ZTM5ZWRjOTBmODlhMzc0OGVhM2ExNGY0Y2NlYWRjMTRlZGUzMWI4OQ==
   data.tar.gz: !binary |-
-    OTdiYTkwNjc1ZTRhMzlmODllNTE1ZWRmNTU3ODU3MTRhNWM5ZGIzZg==
+    NTZjZjJiZDYzNDhhZGUyNDhhMTY5MjZhZDM0OWM2NzY4ODMwMDZmMw==
 SHA512:
   metadata.gz: !binary |-
-    ZGU3NzlkNzA2ODkwYWI1MmMyNjlkM2YxOTUwZjBhNTE1NmZiMmU5MmQ5NGNi
-    NjNhZTY3ZmQ2OWVmYmQ5ZmVlYWJlYjk0ZDVlMDIxMzY3ZGYzY2QzMTljNDM0
-    YzIxYzNjZDI1MTdlNjkyNTQzMGI5MzI1ZmE2ZDlmM2Y0MDE2Mzk=
+    OGYwMjc0YzQzZmU3ZWZmMmMxNDJkNDc0ZGY0ZjlmZjE3OWEwNjNmMTYwMWEy
+    YjEzYTY0OTZkZWUyZTU0NGM4ZGVjZjc4NGMzNjQxOGYwYWQ5MTUzMjhkYTlj
+    NGNiNTQ2ZDhlYTlmYTFmZTVmZWZkNjJmMmUzYmUxMTdlZTJhMWE=
   data.tar.gz: !binary |-
-    NzgwYmU0NTU5ZTQ4YmFmMjJlZWUxZWNmMWMyMmY3ZDMyNmU0NDU2ZDU1MzU4
-    YWFmYmMxNWFmNDQ2YjEyZjJkMjYxZmJmNzg4Mjg4NzlmYTkyMTNiOGNhMTIz
-    MTlhMGNmMjJiNjZjNTQwODcyMTkwMjVmNTMwZmVlNTRiODdmOGY=
+    YjBjMThhNTVmZmE0NTlkMTFlOTRlYWU3MTZmYzQyYWNjZDBkZGY1MjUxODQ3
+    NjFjZWJkMzE5ZGJkMDBmNDJjMGFjMmM2YTE0MDNhMzZhZTRiYjRlZmYxYzkx
+    ZWJhZGNiNzIyNGY1ZDdiMTNkZDU4OTI3ZDZkZWFjYTFmMjQxZGQ=

data/Gemfile

@@ -47,6 +47,7 @@ gem 'rails-assets-backbone'
 gem 'rails-assets-jquery-ui'
 gem 'rails-assets-jquery-autosize'
 gem 'rails-assets-highlightjs'
+gem 'rails-assets-jquery.scrollTo'
 
 
 # Use SCSS for stylesheets

data/Gemfile.lock

@@ -267,6 +267,8 @@ GEM
       rails-assets-jquery (>= 1.7)
     rails-assets-jquery-ui (1.10.4)
       rails-assets-jquery (>= 1.6)
+    rails-assets-jquery.scrollTo (1.4.11)
+      rails-assets-jquery (>= 1.8)
     rails-assets-underscore (1.6.0)
     rails-timeago (2.9.0)
       actionpack (>= 3.1)
@@ -372,6 +374,7 @@ DEPENDENCIES
   rails-assets-highlightjs
   rails-assets-jquery-autosize
   rails-assets-jquery-ui
+  rails-assets-jquery.scrollTo
   rails-assets-underscore
   rails-timeago
   redcarpet

data/app/assets/javascripts/application.js

@@ -30,6 +30,7 @@
 //= require rails-timeago
 //= require underscore
 //= require jquery.blockUI
+//= require jquery.scrollTo
 //= require backbone
 //= require backbone/tawork
 //= require global_search

data/app/assets/javascripts/backbone/views/compare.js.coffee

@@ -0,0 +1,40 @@
+class Tawork.Views.CompareView extends Backbone.View
+  events: 
+    "click .change-item": "scroll_to_change"
+
+  initialize: (options = {}) ->
+    $('.nav.nav-pills li a').click (e) ->
+      e.preventDefault()
+      $(this).tab('show')
+    @setup_change_list()
+
+  setup_change_list: ->
+    $changes = $("[changeid][id]")
+    console.log $changes
+    change_ids = []
+    $changes.each (index, change) ->
+      $change = $(change)
+
+      $li = $("<li/>", class: "page-list-item")
+      id = $change.attr("id")
+      if id.indexOf("added") != -1
+        name = "Added"
+      else
+        name = "Removed"
+
+      $link = $("<a/>", href: "#", class: "change-item").html(name).attr("data-id", $change.attr("id"))
+      $li.append $link
+      $(".compare-change-list").append($li)
+
+  scroll_to_change: (event) ->
+    $diff_link = @$("a[href='#version-diff']")
+
+    if !$diff_link.closest("li").hasClass("active")
+      $diff_link.click()
+
+    $link = $(event.target).closest("a")
+    $change = $("#" + $link.attr("data-id"))
+    $changes = $("[changeid=" + $link.attr("data-id") + "], [changeid=" + $link.attr("data-id") + "] img")
+    $(document).scrollTo $change, 100, onAfter: -> 
+      $changes.effect("highlight")
+    false

data/app/assets/stylesheets/bootstrap_and_overrides.sass

@@ -237,6 +237,9 @@ li.mjs-nestedSortable-expanded
   h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6
     font-family: "Ubuntu", "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif
 
+  img
+    max-width: 100%
+
 .content-description
   clear: both
 
@@ -313,8 +316,6 @@ div.tokenfield.form-control
 
 .compare-column
   min-height: 300px
-  border-right: 1px solid gray
-  border-left: 1px solid gray
-  img
-    width: 100%
-    max-width: 100%
+  // img
+  //   width: 100%
+  //   max-width: 100%

data/app/views/layouts/_compare_layout.html.haml

@@ -1,3 +1,7 @@
 .container-fluid
-  .row
+  .row.compare-view
     = yield
+
+:coffeescript
+  $ ->
+    new Tawork.Views.CompareView el: $(".compare-view").get(0)

data/app/views/wiki/pages/compare.html.haml

@@ -1,4 +1,19 @@
-.col-md-12
+.col-md-3.sidebar
+  %br/
+  %ul.nav.nav-pills{style: "margin-left: 10px"}
+    %li
+      %a{href: "#version-previous"} Previous Version
+    %li.active
+      %a{href: "#version-diff"} Diff
+    %li
+      %a{href: "#version-new"} Applied Changes
+
+  %ul.nav.nav-list.nav-list-panel.compare-change-list
+    %li.nav-header 
+      Change List
+
+
+.col-md-9.col-md-offset-3
   - page_title = title "Comparing version #{params[:version]} for #{@page.title}"
   = render 'breadcrumb', link_last: true
 
@@ -10,9 +25,16 @@
 
   %hr/
 
--# .col-md-6.compare-column
--#   #wiki-content.wiki-content.content-description
--#     = raw @old_html
-.col-md-12.compare-column
+.col-md-9.col-md-offset-3
+
+  %hr/
+
+.col-md-9.col-md-offset-3.compare-column
   #wiki-content.wiki-content.content-description
-    = raw @diff_html
+    .tab-content
+      #version-previous.tab-pane.fade
+        = raw @old_html
+      #version-diff.tab-pane.fade.active.in
+        = raw @diff_html
+      #version-new.tab-pane.fade
+        = raw @new_html

data/lib/tawork/version.rb

@@ -1,3 +1,3 @@
 module Tawork
-  VERSION = '0.0.38'
+  VERSION = '0.0.39'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tawork
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors:
 - Adnan Ali
@@ -47,6 +47,7 @@ files:
 - app/assets/javascripts/backbone/templates/.gitkeep
 - app/assets/javascripts/backbone/views/.gitkeep
 - app/assets/javascripts/backbone/views/attachment.js.coffee
+- app/assets/javascripts/backbone/views/compare.js.coffee
 - app/assets/javascripts/backbone/views/page.js.coffee
 - app/assets/javascripts/backbone/views/ticket.js.coffee
 - app/assets/javascripts/backbone/views/tree_node_page.js.coffee