icfs 0.2.0 → 0.3.0

data/lib/icfs/web/client.rb

@@ -169,6 +169,7 @@ class Client
     when 'case_edit'; return _call_case_edit(env)
     when 'entry_edit'; return _call_entry_edit(env)
     when 'index_edit'; return _call_index_edit(env)
+    when 'action_edit'; return _call_action_edit(env)
     when 'config_edit'; return _call_config_edit(env)
 
     # view
@@ -304,6 +305,7 @@ class Client
     ['tags', :tags, :string].freeze,
     ['caseid', :caseid, :string].freeze,
     ['action', :action, :integer].freeze,
+    ['index', :index, :integer].freeze,
     ['after', :after, :time].freeze,
     ['before', :before, :time].freeze,
     ['stat', :stat, :string].freeze,
@@ -322,7 +324,7 @@ class Client
     [:action, :current].freeze,
     [:time, :entry].freeze,
     [:tags, nil].freeze,
-    [:index, :entry].freeze,
+    [:indexes, nil].freeze,
     [:files, nil].freeze,
     [:stats, nil].freeze,
     [:title, :entry].freeze,
@@ -336,6 +338,7 @@ class Client
     ['after', :after, :time].freeze,
     ['before', :before, :time].freeze,
     ['user', :user, :string].freeze,
+    ['case_edit', :case_edit, :boolean].freeze,
     ['entry', :entry, :integer].freeze,
     ['index', :index, :integer].freeze,
     ['action', :action, :integer].freeze,
@@ -355,6 +358,7 @@ class Client
     [:entry, :log].freeze,
     [:action, :log].freeze,
     [:index, :log].freeze,
+    [:case, :log].freeze,
   ].freeze
 
 
@@ -541,9 +545,9 @@ class Client
       tpl = api.case_read(tid)
       tpl['title'] = ''
       parts = [
-        _form_entry(env, tid, nil),
         _form_create(env),
         _form_case(env, tpl),
+        _form_entry(env, tid, nil),
       ]
       body = [
         _div_nav(env),
@@ -593,8 +597,8 @@ class Client
     if env['REQUEST_METHOD'] == 'GET'
       cse = api.case_read(cid)
       parts = [
-        _form_entry(env, cid, nil),
         _form_case(env, cse),
+        _form_entry(env, cid, nil, {enable: false}),
       ]
       body = [
         _div_nav(env),
@@ -610,19 +614,18 @@ class Client
       # process
       cse = _post_case(env, para)
       ent = _post_entry(env, para)
-      act = _post_action(env, para)
-      if act.is_a?(Integer)
-        ent['action'] = act if act != 0
-        act = nil
-      end
-      ent['caseid'] = cid
+      cse['caseid'] = cid
       cse_old = api.case_read(cid)
       cse['template'] = cse_old['template']
-      api.record(ent, act, nil, cse)
+      api.record(ent, nil, nil, cse)
 
       # display the case
-      body = _div_nav(env) + _div_case(env, cse)
-      return _resp_success(env, body)
+      body = [
+        _div_nav(env),
+        _div_case(env, cse),
+      ]
+      body << _div_entry(env, ent) if ent
+      return _resp_success(env, body.join(''))
     end
   end # def _call_case_edit()
 
@@ -660,16 +663,14 @@ class Client
       end
 
       # build form
-      parts = [ _form_entry(env, cid, ent) ]
-      if !ent &&
-         (act || api.access_list(cid).include?(ICFS::PermAction))
-        parts <<  _form_action(env, cid, act, {edit: false})
-      end
+      opts = {}
+      opts[:enable] = true if enum == 0
+      opts[:action] = anum if anum
+      parts = [ _form_entry(env, cid, ent, opts) ]
       body = [
         _div_nav(env),
         _div_desc(desc, ''),
-        _div_form(env, '/entry_edit/', cid, parts,
-          'Record Entry'),
+        _div_form(env, '/entry_edit/', cid, parts, 'Record Entry'),
       ].join('')
       return _resp_success(env, body)
 
@@ -679,20 +680,15 @@ class Client
 
       # process
       ent = _post_entry(env, para)
-      act = _post_action(env, para)
-      if act.is_a?(Integer)
-        ent['action'] = act if act != 0
-        act = nil
-      end
+      raise(Error::Values, 'Entry form not enabled') unless ent
       ent['caseid'] = cid
-      api.record(ent, act, nil, nil)
+      api.record(ent, nil, nil, nil)
 
       # display the entry
       body = [
         _div_nav(env),
         _div_entry(env, ent)
       ]
-      body << _div_action(env, act) if act
       return _resp_success(env, body.join(''))
     end
   end # def _call_entry_edit()
@@ -719,8 +715,8 @@ class Client
       xnum = _util_num(env, 2)
       idx = api.index_read(cid, xnum) if xnum != 0
       parts = [
-        _form_entry(env, cid, nil),
         _form_index(env, cid, idx),
+        _form_entry(env, cid, nil, {enable: false}),
       ]
       desc = idx ? 'Edit Index' : 'New Index'
       body = [
@@ -737,24 +733,76 @@ class Client
 
       # process
       ent = _post_entry(env, para)
-      act = _post_action(env, para)
       idx = _post_index(env, para)
-      if act.is_a?(Integer)
-        ent['action'] = act if act != 0
-        act = nil
-      end
-      ent['caseid'] = cid
-      api.record(ent, act, idx, nil)
+      idx['caseid'] = cid
+      api.record(ent, nil, idx, nil)
 
       # display the index
       body = [
         _div_nav(env),
-        _div_entry(env, ent),
-        _div_index(env, idx)
+        _div_index(env, idx),
+      ]
+      body << _div_entry(env, ent) if ent
+      return _resp_success(env, body.join(''))
+    end
+  end # def _call_index_edit()
+
+
+  ###############################################
+  # Edit an Action
+  #
+  def _call_action_edit(env)
+    env['icfs.page'] = 'Action Edit'
+    api = env['icfs']
+    _verb_getpost(env)
+
+    cid = _util_case(env)
+
+    # get the form
+    if env['REQUEST_METHOD'] == 'GET'
+      anum = _util_num(env, 2)
+
+      # see if editing is possible
+      unless( api.access_list(cid).include?(ICFS::PermAction) ||
+              ((anum != 0) && api.tasked?(cid, anum)) )
+        raise(Error::Perms, 'Not able to edit this action.')
+      end
+
+      act = api.action_read(cid, anum) if anum != 0
+      opts = {enable: false}
+      opts[:action] = anum if act
+      parts = [
+        _form_action(env, cid, act),
+        _form_entry(env, cid, nil, opts),
+      ]
+      desc = act ? 'Edit Action' : 'New Action'
+      body = [
+        _div_nav(env),
+        _div_desc(desc, ''),
+        _div_form(env, '/action_edit/', cid, parts,
+          'Record Action'),
       ].join('')
       return _resp_success(env, body)
+
+    # post the form
+    elsif env['REQUEST_METHOD'] == 'POST'
+      para = _util_post(env)
+
+      # process
+      ent = _post_entry(env, para)
+      act = _post_action(env, para)
+      act['caseid'] = cid
+      api.record(ent, act, nil, nil)
+
+      # display the index
+      body = [
+        _div_nav(env),
+        _div_action(env, act),
+      ]
+      body << _div_entry(env, ent) if ent
+      return _resp_success(env, body.join(''))
     end
-  end # def _call_index_edit()
+  end # def _call_action_edit()
 
 
   ###############################################
@@ -819,17 +867,15 @@ class Client
     cid = _util_case(env)
     lnum = _util_num(env, 2)
     cse = api.case_read(cid, lnum)
-    if lnum != 0
-      msg = 'This is a historical version of this Case'
-    else
-      msg = ''
-    end
+    ent = api.entry_read(cid, cse['entry']) if cse['entry']
+    msg = (lnum != 0) ? 'This is a historical version of this Case' : ''
     body = [
       _div_nav(env),
       _div_desc('Case Information', msg),
       _div_case(env, cse),
-    ].join('')
-    return _resp_success(env, body)
+    ]
+    body << _div_entry(env, ent) if ent
+    return _resp_success(env, body.join(''))
   end # def _call_case()
 
 
@@ -891,31 +937,37 @@ class Client
     lnum = _util_num(env, 3)
     raise(Error::Interface, 'No Action requested') if anum == 0
 
-    # get the action
     act = api.action_read(cid, anum, lnum)
+    ent = api.entry_read(cid, act['entry']) if act['entry']
+    ent_div = _div_entry(env, ent) if ent
+
+    # historical
     if lnum != 0
       msg = 'This is a historical version of this Action'
+      list_div = ''
+
+    # current
     else
       msg = ''
+      query = {
+        caseid: cid,
+        action: anum,
+        purpose: 'Action Entries',
+      }
+      resp = api.entry_search(query)
+      list_div = _div_list(env, resp, ListEntry) +
+          _div_page(resp){|qu, txt| _a_entry_search(env, qu, txt)}
     end
 
-    # get the entries
-    query = {
-      caseid: cid,
-      action: anum,
-      purpose: 'Action Entries',
-    }
-    resp = api.entry_search(query)
-
     # display
     body = [
       _div_nav(env),
       _div_desc('View Action', msg),
       _div_action(env, act),
-      _div_list(env, resp, ListEntry),
-      _div_page(resp){|qu, txt| _a_entry_search(env, qu, txt)},
-    ].join('')
-    return _resp_success(env, body)
+      ent_div,
+      list_div
+    ]
+    return _resp_success(env, body.join(''))
   end # def _call_action()
 
 
@@ -931,30 +983,37 @@ class Client
     lnum = _util_num(env, 3)
     raise(Error::Interface, 'No Index requested') if xnum == 0
 
-    # get the index
+
     idx = api.index_read(cid, xnum, lnum)
+    ent = api.entry_read(cid, idx['entry']) if idx['entry']
+    ent_div = ent ? _div_entry(env, ent) : ''
+
+    # historical index
     if lnum != 0
       msg = 'This is a historical version of this Index'
+      list_div = ''
+
+    # current index
     else
       msg = ''
+      query = {
+        caseid: cid,
+        index: xnum
+      }
+      resp = api.entry_search(query)
+      list_div = _div_list(env, resp, ListEntry) +
+        _div_page(resp){|qu, txt| _a_entry_search(env, qu, txt)}
     end
 
-    # get the entries
-    query = {
-      caseid: cid,
-      index: xnum
-    }
-    resp = api.entry_search(query)
-
     # display
     body = [
-      _div_nav(env) +
+      _div_nav(env),
       _div_desc('View Index', msg),
       _div_index(env, idx),
-      _div_list(env, resp, ListEntry),
-      _div_page(resp){|qu, txt| _a_entry_search(env, qu, txt)},
-    ].join('')
-    return _resp_success(env, body)
+      ent_div,
+      list_div
+    ]
+    return _resp_success(env, body.join(''))
   end # def _call_index()
 
 
@@ -1177,17 +1236,19 @@ class Client
     entry: 'list-int',
     action: 'list-int',
     index: 'list-int',
+    indexes: 'list-int-sm',
+    case: 'list-int',
     log: 'list-int',
-    tags: 'list-int',
+    tags: 'list-int-sm',
     tag: 'list-tag',
-    stats: 'list-int',
+    stats: 'list-int-sm',
     time: 'list-time',
     title: 'list-title',
     caseid: 'list-caseid',
     stat: 'list-stat',
     sum: 'list-float',
     count: 'list-int',
-    files: 'list-int',
+    files: 'list-int-sm',
     user: 'list-usergrp',
   }.freeze
 
@@ -1218,6 +1279,10 @@ class Client
     end
     head = DivListHead % hcols.join('')
 
+    # do we do relative times?
+    cfg = env['icfs'].config
+    rel_time = cfg.get('rel_time')
+
     # search results into rows
     rows = resp[:list].map do |sr|
       obj = sr[:object]
@@ -1226,6 +1291,7 @@ class Client
       cols = list.map do |sym, opt|
         it = obj[sym]
         cc = ListColClass[sym]
+        ct = nil
 
         # snippets are special non-column, not in the object itself
         if sym == :snippet
@@ -1257,7 +1323,7 @@ class Client
           when :current
             cd = _a_entry(env, cid, it, 0, it.to_s)
           when :log
-            cd = _a_entry(env, cid, it, obj[:log], it.to_s)
+            cd = (it != 0) ? _a_entry(env, cid, it, obj[:log], it.to_s) : ''
           else
             cd = it.to_s
           end
@@ -1268,11 +1334,7 @@ class Client
           when :current
             cd = (it == 0) ? '' :  _a_action(env, cid, it, 0, it.to_s)
           when :log
-            if it != 0
-              cd = _a_action(env, cid, it, obj[:log], it.to_s)
-            else
-              cd = ''
-            end
+            cd = (it != 0) ? _a_action(env, cid, it, obj[:log], it.to_s) : ''
           else
             cd = it == 0 ? '' : it.to_s
           end
@@ -1280,8 +1342,6 @@ class Client
         # index
         when :index
           case opt
-          when :entry
-            cd = (it == 0) ? '' : it.to_s
           when :current
             cd = _a_index(env, cid, it, 0, it.to_s)
           when :log
@@ -1294,8 +1354,21 @@ class Client
             cd = it.to_s
           end
 
+        # case
+        when :case
+          case opt
+          when :log
+            cd = (it != 0) ? _a_case(env, cid, obj[:log], 'Y') : ''
+          else
+            cd = ''
+          end
+
+        # indexes
+        when :indexes
+          cd = (it == 0) ? '' : it.to_s
+
         # log
-      when :log
+        when :log
           case opt
           when :link
             cd = _a_log(env, cid, it, it.to_s)
@@ -1332,13 +1405,20 @@ class Client
 
         # time
         when :time
+          if rel_time
+            tme = ICFS.time_relative(it)
+            ct = ICFS.time_weekday(it, cfg)
+          else
+            tme = ICFS.time_weekday(it, cfg)
+          end
+
           case opt
           when :entry
-            cd = _a_entry(env, cid, obj[:entry], 0, _util_time(env, it))
+            cd = _a_entry(env, cid, obj[:entry], 0, tme)
           when :log
-            cd = _a_log(env, cid, obj[:log], _util_time(env, it))
+            cd = _a_log(env, cid, obj[:log], tme)
           else
-            cd = _util_time(env, it)
+            cd = tme
           end
 
         # title
@@ -1400,7 +1480,15 @@ class Client
           raise NotImplementedError, sym.to_s
         end
 
-        cd ? (DivListItem % [cc, cd]) : ''
+        if cd
+          if ct
+            DivListItemTitle % [cc, ct, cd]
+          else
+            DivListItem % [cc, cd]
+          end
+        else
+          ''
+        end
       end
 
       DivListRow % cols.join('')
@@ -1429,15 +1517,19 @@ class Client
   # Search results header items
   DivListHeadItems = {
     tags: '
-      <div class="list-int">Tags</div>',
+      <div class="list-int-sm" title="Number of tags">#T</div>',
     tag: '
       <div class="list-tag">Tag</div>',
     entry: '
       <div class="list-int">Entry</div>',
     index: '
       <div class="list-int">Index</div>',
+    indexes: '
+      <div class="list-int-sm" title="Number of Indexes">#I</div>',
     action: '
       <div class="list-int">Action</div>',
+    case: '
+      <div class="list-int">Case</div>',
     log: '
       <div class="list-int">Log</div>',
     title: '
@@ -1445,7 +1537,7 @@ class Client
     caseid: '
       <div class="list-caseid">Case ID</div>',
     stats: '
-      <div class="list-int">Stats</div>',
+      <div class="list-int-sm" title="Number of stats">#S</div>',
     time: '
       <div class="list-time">Date/Time</div>',
     stat: '
@@ -1455,7 +1547,7 @@ class Client
     count: '
       <div class="list-int">Count</div>',
     files: '
-      <div class="list-int">Files</div>',
+      <div class="list-int-sm" title="Number of files">#F</div>',
     user: '
       <div class="list-usergrp">User</div>',
     snippet: ''
@@ -1465,6 +1557,10 @@ class Client
   DivListItem = '
       <div class="%s">%s</div>'
 
+  # search results item with title
+  DivListItemTitle = '
+      <div class="%s" title="%s">%s</div>'
+
 
   ###############################################
   # Page description div
@@ -1779,7 +1875,8 @@ class Client
 
     # case links
     links = [
-      _a_log_search(env, {caseid: cid}, 'History of Case'),
+      _a_log_search(env, {caseid: cid, case_edit: true}, 'History of Case'),
+      _a_log_search(env, {caseid: cid}, 'All Logs'),
     ]
     if al.include?(ICFS::PermManage)
       links << _a_case_edit(env, cid, 'Edit This Case')
@@ -1793,13 +1890,14 @@ class Client
     if al.include?(ICFS::PermAction)
       now = Time.now.to_i
       actions = [
+        _a_action_edit(env, cid, 0, 'New Action'),
         _a_action_search(env, {
             caseid: cid,
             assigned: ICFS::UserCase,
             status: true,
             flag: true,
             purpose: 'Flagged Actions',
-          }, 'flagged'),
+          }, 'List flagged'),
         _a_action_search(env, {
             caseid: cid,
             assigned: ICFS::UserCase,
@@ -1807,7 +1905,7 @@ class Client
             before: now,
             sort: 'time_asc',
             purpose: 'Actions - Past Date',
-          }, 'past'),
+          }, 'List past'),
         _a_action_search(env, {
             caseid: cid,
             assigned: ICFS::UserCase,
@@ -1815,19 +1913,19 @@ class Client
             after: now,
             sort: 'time_desc',
             purpose: 'Actions - Future Date',
-          }, 'future'),
+          }, 'List future'),
         _a_action_search(env, {
             caseid: cid,
             assigned: ICFS::UserCase,
             status: true,
             purpose: 'Open Actions',
-          }, 'all open'),
+          }, 'List open'),
         _a_action_tags(env, {
             caseid: cid,
             assigned: ICFS::UserCase,
             status: true,
             purpose: 'Open Action Tags',
-          }, 'tags'),
+          }, 'Action tags'),
       ].map{|lk| DivCaseLink % lk}
       actions = DivCaseActions % actions.join('')
     else
@@ -2051,7 +2149,7 @@ class Client
       action,
       links.map{|lk| DivEntryLink % lk }.join(''),
       Rack::Utils.escape_html(ent['title']),
-      _util_time(env, ent['time']),
+      ICFS.time_weekday(ent['time'], api.config),
       Rack::Utils.escape_html(ent['content']),
       tags.join("\n"),
       index,
@@ -2181,19 +2279,26 @@ class Client
   def _div_log(env, log)
     cid = log['caseid']
     lnum = log['log']
-    enum = log['entry']['num']
 
     navp = (lnum == 1) ? 'prev' : _a_log(env, cid, lnum-1, 'prev')
     navn = _a_log(env, cid, lnum + 1, 'next')
 
-    time = _util_time(env, log['time'])
-
-    if log['case_hash']
-      chash = DivLogCase % _a_case(env, cid, lnum, log['case_hash'])
+    if log['case']
+      chash = DivLogCase % _a_case(env, cid, lnum, log['case']['hash'])
     else
       chash = ''
     end
 
+    if log['entry']
+      enum = log['entry']['num']
+      entry = DivLogEntry % [
+        _a_entry(env, cid, enum, lnum, log['entry']['hash']),
+        enum
+      ]
+    else
+      entry = ''
+    end
+
     if log['action']
       action = DivLogAction % [
         _a_action(env, cid, log['action']['num'], lnum, log['action']['hash']),
@@ -2231,11 +2336,10 @@ class Client
       log['log'],
       navp,
       navn,
-      _util_time(env, log['time']),
+      ICFS.time_weekday(log['time'], env['icfs'].config),
       Rack::Utils.escape_html(log['user']),
       log['prev'],
-      _a_entry(env, cid, enum, lnum, log['entry']['hash']),
-      enum,
+      entry,
       chash,
       action,
       index,
@@ -2275,14 +2379,18 @@ class Client
       <div class="list-row">
         <div class="list-label">Prev:</div>
         <div class="list-hash">%s</div>
-      </div>
+      </div>%s%s%s%s%s
+    </div>
+  </div>'
+
+
+  # log entry
+  DivLogEntry = '
       <div class="list-row">
         <div class="list-label">Entry:</div>
         <div class="list-hash">%s</div>
         <div class="list-int">%d</div>
-      </div>%s%s%s%s
-    </div>
-  </div>'
+      </div>'
 
 
   # log action
@@ -2344,7 +2452,7 @@ class Client
 
     links = []
     anum = act['action']
-    links << _a_entry_edit(env, cid, 0, anum, 'New Entry in Action')
+    links << _a_action_edit(env, cid, anum, 'Edit this Action')
 
     lnum = act['log']
     links << _a_log_search(env, {
@@ -2353,6 +2461,8 @@ class Client
         'purpose' => 'Action History',
       }, 'History of Action')
 
+    links << _a_entry_edit(env, cid, 0, anum, 'New Entry in Action')
+
     # each task
     tasks = []
     ta = act['tasks']
@@ -2379,7 +2489,7 @@ class Client
         Rack::Utils.escape_html(tk['title']),
         tk['status'] ? 'Open' : 'Closed',
         tk['flag'] ? 'Raised' : 'Normal',
-        _util_time(env, tk['time']),
+        ICFS.time_weekday(tk['time'], api.config),
         tags.join(''),
       ]
     end
@@ -2549,6 +2659,7 @@ class Client
   # Description div for queries
   #
   def _div_query(env, type, sup, query, disp=false)
+    cfg = env['icfs'].config
 
     # query purpose
     if query[:purpose]
@@ -2571,7 +2682,7 @@ class Client
       when :integer
         para = val.to_s
       when :time
-        para = _util_time(env, val)
+        para = ICFS.time_local(val, cfg)
       else
         raise NotImplementedError, pr.to_s
       end
@@ -2613,6 +2724,7 @@ class Client
   # Query form
   #
   def _form_query(env, sup, query, act, disp=false)
+    cfg = env['icfs'].config
 
     # supported params
     inputs = sup.map do |txt, sym, pr|
@@ -2678,6 +2790,10 @@ class Client
         ilabel = 'Permission'
         iclass = 'form-perm'
         ihint = 'Filter for cases granting this permission.'
+      when :case_edit
+        ilabel = 'Case edited'
+        iclass = 'form-boolean'
+        ihint = 'Filter for logs recoding a case.'
       when :entry
         ilabel = 'Entry'
         iclass = 'form-int'
@@ -2726,7 +2842,7 @@ class Client
         ivalue = query[sym] ? query[sym].to_s : ''
       when :time
         itype = 'text'
-        ivalue = query[sym] ? _util_time(env, query[sym]) :  ''
+        ivalue = query[sym] ? ICFS.time_local(query[sym], cfg) :  ''
       else
         raise NotImplementedError, pr.to_s
       end
@@ -2945,7 +3061,13 @@ class Client
   #############################################
   # New entry form
   #
-  def _form_entry(env, cid, ent=nil)
+  # @param env [Hash] Rack enviornment
+  # @param cid [String] caseid
+  # @param ent [Hash] the Entry
+  # @param opts [Hash] options
+  #
+  #
+  def _form_entry(env, cid, ent=nil, opts={})
     api = env['icfs']
 
     # title
@@ -2957,11 +3079,20 @@ class Client
 
     # time
     if ent && ent['time']
-      time = _util_time(env, ent['time'])
+      time = ICFS.time_local(ent['time'], api.config)
     else
       time = ''
     end
 
+    # action
+    if opts[:action]
+      anum = opts[:action]
+    elsif ent && ent['action']
+      anum = ent['action']
+    else
+      anum = 0
+    end
+
     # content
     if ent && ent['content']
       content = Rack::Utils.escape_html(ent['content'])
@@ -3070,8 +3201,11 @@ class Client
     end
 
     return FormEntry % [
+        opts[:enable] ? 'true' : 'false',
         ent ? ent['entry'] : 0,
-        (ent && ent['action']) ? ent['action'] : 0,
+        anum,
+        opts[:enable] ? '' : FormEntryEnable,
+        opts[:enable] ? '' : ' hidden',
         title, time, content,
         tags_cnt, tags,
         files_cnt, files,
@@ -3084,6 +3218,15 @@ class Client
   end # def _form_entry
 
 
+  # entry toggle button
+  FormEntryEnable = '
+      <div class="sect-right">
+        <button id="ent-ena-button" class="ent-ena" type="button"
+          onclick="entEnable()">Toggle Edit
+        </button>
+      </div>'.freeze
+
+
   # entry edit form
   FormEntry = '
     <div class="sect">
@@ -3093,9 +3236,14 @@ class Client
           Describe the activity.
         </div></div>
         <div class="sect-fill"> </div>
+        <input id="ent-ena" name="ent-ena" type="hidden" value="%s">
         <input name="ent-num" type="hidden" value="%d">
-        <input name="ent-act" type="hidden" value="%d">
+        <input name="ent-act" type="hidden" value="%d">%s
       </div>
+    </div>
+    <div id="ent-body" class="ent-body%s">
+
+    <div class="sect">
       <div class="form-row">
         <div class="list-label">Title:</div>
         <input class="form-title" name="ent-title" type="text"
@@ -3210,6 +3358,7 @@ class Client
       <input type="hidden" name="ent-perm-cnt" id="ent-perm-cnt" value="%d">
       <div class="perms-list" id="ent-perm-list">%s
       </div>
+    </div>
     </div>'
 
 
@@ -3295,8 +3444,9 @@ class Client
   ###############################################
   # Action form
   #
-  def _form_action(env, cid, act = nil, opt={})
+  def _form_action(env, cid, act = nil)
     api = env['icfs']
+    cfg = api.config
 
     # new action
     if !act
@@ -3324,17 +3474,6 @@ class Client
     ur.add api.user
     ur.merge api.roles
 
-    # editing
-    if opt[:edit]
-      ena_val = 'true'
-      ena_class_add = ''
-      ena_class_tasks = ''
-    else
-      ena_val = 'false'
-      ena_class_add = ' invisible'
-      ena_class_tasks = ' hidden'
-    end
-
     # each task
     tasks = []
     ta.each_index do |ixr|
@@ -3361,7 +3500,7 @@ class Client
         flag = FormActionFlagEd % [
           ix, tk['flag'] ? ' checked' : '' ]
         if tk['time']
-          time = FormActionTimeEd % [ ix, _util_time(env, tk['time']) ]
+          time = FormActionTimeEd % [ ix, ICFS.time_local(tk['time'], cfg) ]
         else
           time = FormActionTimeEd % [ix, '']
         end
@@ -3395,7 +3534,7 @@ class Client
         else
           flag = FormActionFlagEd % [ ix, '' ]
         end
-        esc = _util_time(env, tk['time'])
+        esc = ICFS.time_local(tk['time'], cfg)
         time = FormActionTimeRo % [ ix, esc, esc ]
 
         tags_cnt = 0
@@ -3422,11 +3561,8 @@ class Client
 
     return FormAction % [
         act ? act['action'] : 0,
-        ena_class_add,
-        ena_val,
         tasks.size,
         act ? act['action'] : 0,
-        ena_class_tasks,
         tasks.join('')
       ]
   end # def _form_action()
@@ -3439,24 +3575,18 @@ class Client
         <div class="sect-label">Action</div>
         <div class="tip"><div class="tip-disp"></div><div class="tip-info">
           A unit of work, accomplished in a set of related real-world
-          and administrative activitires.
+          and administrative activities.
         </div></div>
         <div class="sect-fill"> </div>
         <input name="act-num" type="hidden" value="%d">
-        <div class="sect-right">
-          <button id="act-ena-button" class="act-ena" type="button"
-            onclick="actEnable()">Toggle Edit
-          </button>
-        </div>
-        <div id="act-task-add" class="sect-right%s">
+        <div id="act-task-add" class="sect-right">
           <button class="tsk-add" type="button" onclick="actAddTask()">+
           </button>
         </div>
-        <input id="act-ena" name="act-ena" type="hidden" value="%s">
         <input id="act-cnt" name="act-cnt" type="hidden" value="%d">
         <input type="hidden" name="act-num" value="%d">
       </div>
-      <div id="act-tasks" class="%s">%s
+      <div id="act-tasks">%s
       </div>
     </div>'
 
@@ -3685,8 +3815,10 @@ class Client
   # Config Form
   #
   def _form_config(env)
-    tz = env['icfs'].config.get('tz')
-    return FormConfig % [tz]
+    cfg = env['icfs'].config
+    tz = cfg.get('tz')
+    rel_time = cfg.get('rel_time') ? 'true' : 'false'
+    return FormConfig % [tz, rel_time]
   end # def _form_config()
 
 
@@ -3707,6 +3839,13 @@ class Client
           Timezone to display date/times, format as +/-HH:MM.
         </div></div>
       </div>
+      <div class="form-row">
+        <div class="list-label">Rel. Time:</div>
+        <input class="form-boolean" name="cfg-reltime" type="text" value="%s">
+        <div class="tip"><div class="tip-disp"></div><div class="tip-info">
+          Display relative times e.g. 3 days ago.
+        </div></div>
+      </div>
     </div>'
 
 
@@ -3800,6 +3939,8 @@ class Client
   # Entry edit
   #
   def _post_entry(env, para)
+    return nil unless para['ent-ena'] == 'true'
+
     api = env['icfs']
 
     # entry object
@@ -3933,17 +4074,12 @@ class Client
   # Action edit
   #
   def _post_action(env, para)
-
-    # action object
     act = {}
 
     # action
     anum = para['act-num'].to_i
     act['action'] = anum if anum != 0
 
-    # any edit?
-    return anum unless para['act-ena'] == 'true'
-
     # tasks
     tasks = []
     acnt = para['act-cnt'].to_i
@@ -3952,6 +4088,7 @@ class Client
       tx = 'act-%d' % [ix + 1]
 
       ug = para[tx + '-task']
+      next if ug.nil? || ug.empty?
       title = para[tx + '-title']
       status = (para[tx + '-status'] == 'true') ? true : false
       flag = (para[tx + '-flag'] == 'true') ? true : false
@@ -4025,7 +4162,8 @@ class Client
   #
   def _post_config(env, para)
     cfg = {
-      'tz' => para['cfg-tz']
+      'tz' => para['cfg-tz'],
+      'rel_time' => (para['cfg-reltime'].downcase == 'true' ? true : false),
     }
     return cfg
   end # def _post_config()
@@ -4212,6 +4350,19 @@ class Client
   end
 
 
+  ###############################################
+  # Link to Action edit
+  #
+  def _a_action_edit(env, cid, anum, txt)
+    '<a href="%s/action_edit/%s/%d">%s</a>' % [
+      env['SCRIPT_NAME'],
+      Rack::Utils.escape(cid),
+      anum,
+      Rack::Utils.escape_html(txt)
+    ]
+  end
+
+
   ###############################################
   # Link to Config edit
   #
@@ -4377,15 +4528,6 @@ class Client
   end # def _util_num()
 
 
-  ###############################################
-  # Epoch time as local
-  #
-  def _util_time(env, time)
-    tz = env['icfs'].config.get('tz')
-    Time.at(time).getlocal(tz).strftime('%F %T')
-  end
-
-
   ###############################################
   # Parse a provided time string
   #
@@ -4429,7 +4571,7 @@ class Client
       when :array
         query[sym] = val.split(',').map{|aa| aa.strip}
       when :boolean
-        if val == 'true'
+        if val.downcase == 'true'
           query[sym] = true
         elsif val == 'false'
           query[sym] = false