icfs 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba64d02837a0591aee2cab20c11795beffa59f3ec3dce2014ac7dd0b55e89e5
-  data.tar.gz: 1b452562fa4df0cf870eb0ed5bbbf0f686b4ba78579e47e7ce075e84e18b1954
+  metadata.gz: a1a35a2e0403c01c2e6aa54db7014b1f41fc2769525afa66e2af066ae5b523fe
+  data.tar.gz: c9d77e1e72454fda263561f2640cbf14c0d24887038520868ddac3d273bc9c23
 SHA512:
-  metadata.gz: '02909a341866abc4eb1eaa844317dd02b72ed55c59b0df518f3e54af06a024f6cb4ac2ea8f14a2b64b99e60bdd9dc2bc87ceee421ed591c498db1f0e5c4305c4'
-  data.tar.gz: 562c4de6f8605b2ab7b414101642488a93b98fa94157ba4408ed640b6944f8cee33ecb3f710be87570760fd7d0fc6249c2b353163173f64ea53d52624b7b91fe
+  metadata.gz: 51dab31789c7fd5b1d3ce257b2bff25706727d555a6afab5d1a71e199eb8258a5ac13ab9b0471bdfcf8ffd3d8ba753f8d1d063c291ff2fc6b0759c6881ab779c
+  data.tar.gz: 00ac3104db418aa2f9bc07268299742605c71a49e572e677fc2572e506a079dd04b6d752ea0ea59537eef9254d11a83251da5667e05a66a6fb04040d55eedd77

data/data/icfs-dark.css

@@ -0,0 +1,504 @@
+/*************************************************************************
+#
+# Investigative Case File System
+#
+# Copyright 2019 by Graham A. Field
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3.
+#
+# This program is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+**************************************************************************/
+
+/*************************************************************************
+  General
+*/
+
+
+html {
+  background-color: #212121;
+}
+
+div {
+  color: #ffffff;
+  background-color: #212121;
+}
+
+a {
+  color: #ffffff;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+
+input {
+  border: 1px solid black;
+  border-radius: 3px;
+  font-family: serif;
+  font-size: 12pt;
+  margin: 0.1em;
+  padding: 0.2em;
+}
+
+textarea {
+  border: 1px solid black;
+  border-radius: 3px;
+  font-family: serif;
+  font-size: 12pt;
+  margin: 0.1em;
+  padding: 0.2em;
+}
+
+
+/*************************************************************************
+  Navbar
+*/
+
+div.nav {
+  border-width: 3px;
+  border-style: none none solid none;
+  border-color: green;
+  display: flex;
+}
+
+div.nav-icfs {
+  color: green;
+  width: 3em;
+}
+
+div.nav-icfs a {
+  color: green;
+}
+
+div.nav-case {
+  color: blue;
+  width: 15em;
+}
+
+div.nav-case a {
+  color: blue;
+}
+
+div.nav-tab {
+  text-align: center;
+  border: 1px;
+  width: 7em;
+  border-style: solid solid none solid;
+  border-radius: 5px 5px 0 0;
+}
+
+
+/*************************************************************************
+ Sidebar layout
+*/
+
+div.sbar {
+  border-bottom: thin solid;
+  display: flex;
+  align-content: stretch;
+}
+
+div.sbar-main {
+  flex: 1 0 0;
+  vertical-align: top;
+}
+
+div.sbar-side {
+  flex: 0 0 20em;
+  border-right: thin solid;
+  vertical-align: top;
+}
+
+div.sbar-side-head {
+  text-align: center;
+  border-bottom: thin solid;
+  color: rgba(0, 0, 255, 89);
+}
+
+div.sbar-main-head {
+  font-size: 120%;
+  padding: 0.25em;
+}
+
+div.sbar-main-sub {
+  font-weight: bold;
+  font-size: 75%;
+}
+
+pre.sbar-main-content {
+  font-family: serif;
+  font-size: 12pt;
+  border-top: thin solid;
+  border-bottom: thin solid;
+  margin: 0px;
+  padding: 0.25em;
+  white-space: pre-wrap;
+}
+
+
+/*************************************************************************
+  Sections
+*/
+
+div.sect {
+  padding: 0.25em;
+}
+
+div.sect-head {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 0.2em;
+  background: #446600;
+}
+
+div.sect-head div {
+  background: #446600;
+}
+
+div.sect-main {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 0.2em;
+  background: #99bbff;
+}
+
+div.sect-main div {
+  background: #99bbff;
+}
+
+
+div.sect-label {
+  flex: 0 1 auto;
+}
+
+
+div.sect-fill {
+  flex: 1 1 auto;
+}
+
+
+div.sect-head-right {
+  flex: 0 1 auto;
+}
+
+
+/*************************************************************************
+  List
+*/
+
+div.list-head {
+  display: flex;
+  flex-direction: row;
+  border-bottom: solid;
+  border-width: 1px;
+  font-style: italic;
+}
+
+
+div.list-row {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  border-bottom: dotted;
+  border-width: 1px;
+  align-items: flex-start;
+}
+
+
+div.list-int {
+  width: 4em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-int-sm {
+  width: 2em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-perm {
+  width: 15em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-usergrp {
+  width: 15em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-label {
+  width: 7em;
+  padding: 0 0.15em 0 0.15em;
+  text-align: right;
+}
+
+
+div.list-caseid {
+  width: 10em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-text-s {
+  width: 8em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-text-m {
+  width: 12em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-time {
+  width: 15em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+
+div.list-tag {
+  width: 12em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+div.list-hash {
+  font-family: monospace;
+  font-size: 12pt;
+  padding: 0 0.15em 0 0.15em;
+}
+
+div.list-stat {
+  width: 12em;
+  padding: 0 0.15em 0 0.15em;
+}
+
+div.list-snip {
+  flex: 0 1 100%;
+  padding: 0.1em;
+  margin: 0.1em 1em 0.1em 1em;
+  background: #f0f0f0;
+}
+
+/*************************************************************************
+  Tasks
+*/
+
+div.task {
+  border-bottom: thin solid;
+}
+
+
+div.task-ed {
+  background: #99b3ff;
+}
+
+
+div.task-ro {
+  background: #ff6666;
+}
+
+
+/*************************************************************************
+  Forms
+*/
+
+div.form-row {
+  min-height: 2em;
+  display: flex;
+  flex-direction: row;
+  align-items: baseline;
+}
+
+
+input.form-index {
+  width: 20em;
+}
+
+
+input.form-stat {
+  width: 15em;
+}
+
+
+input.form-usergrp {
+  width: 10em;
+}
+
+
+input.form-caseid {
+  width: 12em;
+}
+
+
+input.form-sort {
+  width: 10em;
+}
+
+
+input.form-content {
+  width: 50em;
+}
+
+
+input.form-title {
+  width: 40em;
+}
+
+
+input.form-file-name {
+  width: 30em;
+}
+
+
+input.form-file-upl {
+}
+
+
+input.form-float {
+  width: 5em;
+}
+
+
+input.form-check {
+}
+
+
+input.form-time {
+  width: 15em;
+}
+
+
+input.form-perm {
+  width: 15em;
+}
+
+
+input.form-int {
+  width: 5em;
+}
+
+
+input.form-tag {
+  width: 20em;
+}
+
+
+input.form-boolean {
+  width: 5em;
+}
+
+
+textarea.form-content {
+  width: 50em;
+  height: 20em;
+}
+
+
+/*************************************************************************
+ Other divs
+*/
+
+div.desc {
+  padding: 0.25em;
+  background: #663d00;
+  margin-bottom: 1em;
+}
+
+div.desc div {
+  background: #663d00;
+}
+
+div.desc-head {
+  font-size: 120%;
+  text-align: center;
+}
+
+span.desc-query {
+  text-decoration: underline;
+
+}
+
+div.query-form {
+  border-bottom: solid;
+  border-width: 1px;
+  padding: 0.5em;
+}
+
+
+
+div.hidden {
+  display: none;
+}
+
+div.invisible {
+  visibility: hidden;
+}
+
+
+/*************************************************************************
+  Tooltips
+*/
+
+div.tip {
+  display: inline-block;
+}
+
+div.tip div.tip-disp {
+  border: thin solid;
+  border-radius: 50%;
+  font-size: 60%;
+  text-align: center;
+  width: 1.1em;
+  height: 1.1em;
+  margin: 0 0.1em;
+}
+
+
+div.tip div.tip-disp::before {
+  content: "?";
+}
+
+
+/* status bar tooltips */
+div.tip div.tip-info {
+  visibility: hidden;
+  background-color: black;
+  color: #fff;
+  position: fixed;
+  padding: 0.5em;
+  bottom: 0;
+  left: 0;
+  width: 100vw;
+}
+
+
+/* floating tooltips
+div.tip div.tip-info {
+  visibility: hidden;
+  background-color: black;
+  color: #fff;
+  border-radius: 0.5em;
+  padding: 0.5em;
+  margin: 0.25em;
+  width: 25em;
+  margin-left: 0em;
+  position: absolute;
+  z-index: 1;
+}
+*/
+
+
+div.tip:hover div.tip-info {
+  visibility: visible;
+}

data/devel/run/base.rb

@@ -59,11 +59,12 @@ def get_base
     current: 'current',
   }.freeze
 
-  # default config
-  defaults = {
-    'tz' => '-04:00',
-    'rel_time' => true,
-  }
+  # config setup
+  setup = [
+    ['tz', ICFS::Config::SetupTimezone].freeze,
+    ['rel_time', ICFS::Config::SetupRelTime].freeze,
+    ['css', ICFS::Config::SetupCss].freeze,
+  ].freeze
 
   # base objects
   cache = ICFS::CacheElastic.new(map, es)
@@ -74,7 +75,7 @@ def get_base
       expires: 60, # one minute cache for testing
       log: log,
     })
-  config_base = ICFS::ConfigS3.new(defaults, s3, 'icfs', 'config/')
+  config_base = ICFS::ConfigS3.new(setup, s3, 'icfs', 'config/')
   config = ICFS::ConfigRedis.new(redis, config_base, {
       prefix: 'config/',
       expires: 60,  # debug, only cache for one minute

data/devel/run/webrick.rb

@@ -20,7 +20,7 @@ require_relative '../../lib/icfs/demo/static'
 base = get_base()
 api = base[:api]
 
-web = ICFS::Web::Client.new('/static/icfs.css', '/static/icfs.js')
+web = ICFS::Web::Client.new('/static/icfs.js')
 
 # static files
 static = {
@@ -28,6 +28,10 @@ static = {
     'path' => '/icfs/data/icfs.css',
     'mime' => 'text/css; charset=utf-8'
   },
+  '/static/icfs-dark.css' => {
+    'path' => '/icfs/data/icfs-dark.css',
+    'mime' => 'text/css; charset=utf-8'
+  },
   '/static/icfs.js' => {
     'path' => '/icfs/data/icfs.js',
     'mime' => 'application/javascript; charset=utf-8'

data/lib/icfs.rb

@@ -22,7 +22,7 @@ require_relative 'icfs/validate'
 module ICFS
 
   # version: major, minor, patch
-  Version = [0, 3, 0].freeze
+  Version = [0, 3, 1].freeze
 
   # version pre-release
   VersionPre = nil

data/lib/icfs/cache_elastic.rb

@@ -811,7 +811,7 @@ class CacheElastic < Cache
     # build the query
     filter = [
       _query_term('caseid', query[:caseid]),
-      _query_times('times', query[:after], query[:before]),
+      _query_times('time', query[:after], query[:before]),
       _query_term('user', query[:user]),
       _query_exists('case.set', query[:case_edit]),
       _query_term('entry.num', query[:entry]),

data/lib/icfs/config.rb

@@ -11,7 +11,8 @@
 
 # frozen_string_literal: true
 
-#
+require 'set'
+
 module ICFS
 
 ##########################################################################
@@ -21,32 +22,96 @@ module ICFS
 #
 class Config
 
-  ###############################################
-  # Valid config options
-  ValConfig = {
-    method: :hash,
-    optional: {
-      'tz' => {
-        method: :string,
-        valid: /[+\-](0[0-9]|1[0-2]):[0-5][0-9]/.freeze,
-        whitelist: true,
-      }.freeze,
-      'rel_time' => Validate::IsBoolean,      
-    }.freeze
+  # Default setup for 'tz'
+  SetupTimezone = {
+    name: 'Timezone',
+    default: '+00:00',
+    validate: {
+      method: :string,
+      valid: /[+\-](0[0-9]|1[0-2]):[0-5][0-9]/.freeze,
+      whitelist: true,
+    }.freeze,
+    label: 'cfg-tz',
+    input: [:text, 'form-tz'].freeze,
+    parse: :text,
+    tip: 'Timezone to display date/times, format as +/-HH:MM.',
+    display: 'list-text-m',
+  }.freeze
+
+
+  # default setup for 'rel_time'
+  SetupRelTime = {
+    name: 'Rel. Time',
+    default: true,
+    validate: Validate::IsBoolean,
+    label: 'cfg-reltime',
+    input: [:boolean].freeze,
+    parse: :boolean,
+    tip: 'Display relative times e.g. 3 days ago.',
+    display: 'list-text-s',
   }.freeze
 
+
+  # default setup for 'css'
+  SetupCss = {
+    name: 'Style',
+    default: '/static/icfs.css',
+    validate: {
+      method: :string,
+      allowed: Set[
+        '/static/icfs.css',
+        '/static/icfs-dark.css'
+      ].freeze,
+      whitelist: true,
+    }.freeze,
+    label: 'cfg-css',
+    input: [
+      :select,
+      'form-css',
+      'cfg-css',
+      [
+        ['/static/icfs.css', 'Light'].freeze,
+        ['/static/icfs-dark.css', 'Dark'].freeze,
+      ].freeze
+    ].freeze,
+    parse: :text,
+    tip: 'Display settings for web interface.',
+    display: 'list-text-l',
+  }.freeze
+
+
   ###############################################
   # New instance
   #
-  # @param defaults [Hash] The default options
+  # @param setup [Array<Array>] The setup array
+  #
+  # Each item is a \[key, hash\], each hash should contain:
+  # - :name The name of the config setting
+  # - :default The default value
+  # - :validate A Validator
+  # - :label The HTML label
+  # - :input Array used by {Web::Client#_form_config}
+  # - :parse
+  # - :tip Text of the tup
+  # - :display Array to pass to {Web::Client#_div_config}
   #
-  def initialize(defaults={})
+  def initialize(setup)
     @data = {}
     @unam = nil
-    @defaults = defaults
+    @order = []
+    @setup = {}
+    setup.each do |ary|
+      @order << ary[0]
+      @setup[ary[0]] = ary[1]
+    end
   end # def initialize()
 
 
+  ###############################################
+  # Clear data
+  def clear; @data = {}; end
+
+
   ###############################################
   # The configuration values hash
   #
@@ -59,13 +124,25 @@ class Config
   attr_reader :defaults
 
 
+  ###############################################
+  # Get the option for this key
+  #
+  def _opt(key)
+    opt = @setup[key]
+    raise(ArgumentError, 'Invalid config option') unless opt
+    return opt
+  end # def _opt()
+  private :_opt
+
+
   ###############################################
   # Get a value
   #
   # @param key [String] The name of the config setting
   #
   def get(key)
-    @data.key?(key) ? @data[key] : @defaults[key]
+    opt = _opt(key)
+    @data.key?(key) ? @data[key] : opt[:default]
   end
 
 
@@ -76,10 +153,45 @@ class Config
   # @param val [Object] The value of the config setting
   #
   def set(key, val)
+    opt = _opt(key)
+    Items.validate(val, opt[:name], opt[:validate])
     @data[key] = val
   end
 
 
+  ###############################################
+  # Get the default value
+  #
+  # @param key [String] The name of the config setting
+  def default(key)
+    opt = _opt(key)
+    opt[:default]
+  end
+
+
+  ###############################################
+  # Is the value set?
+  #
+  # @param key [String] The name of the config setting
+  #
+  def set?(key); @data.key?(key); end
+
+
+  ###############################################
+  # Get setup
+  # @param key [String] the specific key to get
+  # @return [Hash, Array] the setup for the key or
+  #   an array of \[key, setup\]
+  #
+  def setup(key=nil)
+    return _opt(key) if key
+
+    return @order.map do |key|
+      [key, @setup[key]]
+    end
+  end # def setup
+
+
   ###############################################
   # Where to store objects
   #
@@ -89,6 +201,43 @@ class Config
   private :_key
 
 
+  ###############################################
+  # Parse JSON encoded config settings
+  def _parse(json)
+
+    if json.nil?
+      raise(Error::NotFound, 'Config not found')
+    end
+
+    begin
+     itm = JSON.parse(json)
+    rescue
+     raise(Error::Value, 'JSON parsing failed')
+    end
+
+    errs = {}
+    itm.each do |key, val|
+      opt = @setup[key]
+      raise(Error::Value, 'Unsupported config option %s' % key) if !opt
+      err = Validate.check(val, opt[:validate])
+      errs[key] = err if err
+    end
+    unless errs.empty?
+      raise(Error::Value, 'Config has bad settings: %s' % errs.inspect)
+    end
+
+    @data = itm
+  end
+  private :_parse
+
+
+  ###############################################
+  # Generate a JSON encoded string
+  def _generate()
+    JSON.pretty_generate(@data)
+  end
+
+
   ###############################################
   # Load a user configuration
   #

data/lib/icfs/config_redis.rb

@@ -31,7 +31,7 @@ class ConfigRedis < Config
   # @option opts [Integer] :expires Expiration time in seconds
   #
   def initialize(redis, base, opts={})
-    super(base.defaults)
+    super(base.setup)
     @redis = redis
     @base = base
     @pre = opts[:prefix] || ''
@@ -50,7 +50,7 @@ class ConfigRedis < Config
     # try cache
     json = @redis.get(key)
     if json
-      @data = Items.parse(json, 'Config values', Config::ValConfig)
+      _parse(json)
       return true
     end
 
@@ -66,7 +66,7 @@ class ConfigRedis < Config
   #
   def save()
     raise(RuntimeError, 'Save requires a user name') if !@unam
-    json = Items.generate(@data, 'Config values', Config::ValConfig)
+    json = _generate()
     @redis.del(_key(@unam))
     @base.data = @data
     @base.save

data/lib/icfs/config_s3.rb

@@ -24,13 +24,13 @@ class ConfigS3 < Config
   ###############################################
   # New instance
   #
-  # @param defaults [Hash] The default options
+  # @param setup [Array] The setup
   # @param s3 [Aws::S3::Client] the configured S3 client
   # @param bucket [String] The bucket name
   # @param prefix [String] Prefix to use for object keys
   #
-  def initialize(defaults, s3, bucket, prefix=nil)
-    super(defaults)
+  def initialize(setup, s3, bucket, prefix=nil)
+    super(setup)
     @s3 = s3
     @bck = bucket
     @pre = prefix || ''
@@ -44,7 +44,7 @@ class ConfigS3 < Config
     Items.validate(unam, 'User/Role/Group name', Items::FieldUsergrp)
     @unam = unam.dup
     json = @s3.get_object( bucket: @bck, key: _key(unam) ).body.read
-    @data = Items.parse(json, 'Config values', Config::ValConfig)
+    _parse(json)
     return true
   rescue
     @data = {}
@@ -57,7 +57,7 @@ class ConfigS3 < Config
   #
   def save()
     raise(RuntimeError, 'Save requires a user name') if !@unam
-    json = Items.generate(@data, 'Config values', Config::ValConfig)
+    json = _generate()
     @s3.put_object( bucket: @bck, key: _key(@unam), body: json )
   end # def save()
 

data/lib/icfs/web/client.rb

@@ -28,11 +28,9 @@ class Client
   ###############################################
   # New instance
   #
-  # @param css [String] the URL for the stylesheet
   # @param js [String] the URL for the javascript
   #
-  def initialize(css, js)
-    @css = css.freeze
+  def initialize(js)
     @js = js.freeze
   end
 
@@ -226,8 +224,10 @@ class Client
     _verb_get(env)
     body = [
       _div_nav(env),
-      _div_desc('Info', ''),
-      _div_info(env)
+      _div_desc('User Info', ''),
+      _div_info(env),
+      _div_desc('Config Info', ''),
+      _div_config(env),
     ].join('')
     return _resp_success(env, body)
   end # def _call_info()
@@ -547,7 +547,7 @@ class Client
       parts = [
         _form_create(env),
         _form_case(env, tpl),
-        _form_entry(env, tid, nil),
+        _form_entry(env, tid, nil, {no_index: true}),
       ]
       body = [
         _div_nav(env),
@@ -569,7 +569,7 @@ class Client
       cse['template'] = (para['create_tmpl'] == 'true') ? true : false
 
       # process entry
-      ent = _post_entry(env, para)
+      ent = _post_entry(env, para, {no_index: true})
       Items.validate(tid, 'Template ID', Items::FieldCaseid)
       ent['caseid'] = cid
 
@@ -828,7 +828,9 @@ class Client
     # post the form
     elsif env['REQUEST_METHOD'] == 'POST'
       para = _util_post(env)
-      _post_config(env, para).each{|key, val| cfg.set(key,val) }
+      vals = _post_config(env, para)
+      cfg.clear
+      vals.each{|key, val| cfg.set(key,val) }
       cfg.save
       api.user_flush()
 
@@ -836,7 +838,7 @@ class Client
       body = [
         _div_nav(env),
         _div_desc('Edit Configuration', 'Settings saved'),
-        _div_info(env),
+        _div_config(env),
       ].join('')
       return _resp_success(env, body)
     end
@@ -1163,6 +1165,39 @@ class Client
   <div class="message">%s
   </div>'
 
+  ###############################################
+  # Config div
+  #
+  def _div_config(env)
+    api = env['icfs']
+    cfg = api.config
+
+    items = cfg.setup.map do |key, opt|
+      DivConfigItem % [
+        opt[:name],
+        opt[:display],
+        _util_config(cfg, key, cfg.get(key))
+      ]
+    end
+    return DivConfig % items.join('')
+  end # def _div_config
+
+
+  # The config settings div
+  DivConfig = '
+  <div class="config">
+    <div class="list">%s
+    </div>
+  </div>'
+
+
+  # each config setting
+  DivConfigItem = '
+      <div class="list-row">
+        <div class="list-label">%s:</div>
+        <div class="%s">%s</div>
+      </div>'
+
 
   ###############################################
   # Info div
@@ -1180,7 +1215,6 @@ class Client
     gstats = api.gstats.map{|st| DivInfoList % Rack::Utils.escape_html(st)}
 
     return DivInfo % [
-      Rack::Utils.escape_html(tz),
       Rack::Utils.escape_html(api.user),
       roles.join(''),
       grps.join(''),
@@ -1194,10 +1228,6 @@ class Client
   DivInfo = '
   <div class="info">
     <div class="list">
-      <div class="list-row">
-        <div class="list-label">Timezone:</div>
-        <div class="list-text-s">%s</div>
-      </div>
       <div class="list-row">
         <div class="list-label">User:</div>
         <div class="list-text-m">%s</div>
@@ -3065,6 +3095,8 @@ class Client
   # @param cid [String] caseid
   # @param ent [Hash] the Entry
   # @param opts [Hash] options
+  # @option opts [Integer] The action num
+  # @option opts [Boolean] :no_index Does not display indexe
   #
   #
   def _form_entry(env, cid, ent=nil, opts={})
@@ -3131,7 +3163,9 @@ class Client
 
     # indexes
     index_cnt = 0
-    if ent && ent['index']
+    if opts[:no_index]
+      index = ''
+    elsif ent && ent['index']
       idx_list = ent['index'].map do |xnum|
         index_cnt += 1
         idx = api.index_read(cid, xnum, 0)
@@ -3200,6 +3234,17 @@ class Client
       perms = ''
     end
 
+    # do index
+    if opts[:no_index]
+      index = ''
+    else
+      index = FormEntryIndex % [
+        env['SCRIPT_NAME'],
+        Rack::Utils.escape(cid),
+        index_cnt, index,
+      ]
+    end
+
     return FormEntry % [
         opts[:enable] ? 'true' : 'false',
         ent ? ent['entry'] : 0,
@@ -3209,9 +3254,7 @@ class Client
         title, time, content,
         tags_cnt, tags,
         files_cnt, files,
-        env['SCRIPT_NAME'],
-        Rack::Utils.escape(cid),
-        index_cnt, index,
+        index,
         stats_sel, stats_cnt, stats,
         perms_sel, perms_cnt, perms
       ]
@@ -3300,28 +3343,7 @@ class Client
       <input type="hidden" id="ent-file-cnt" name="ent-file-cnt" value="%d">
       <div class="files-list" id="ent-file-list">%s
       </div>
-    </div>
-
-    <div class="sect">
-      <div class="sect-head">
-        <div class="sect-label">Indexes</div>
-        <div class="tip"><div class="tip-disp"></div><div class="tip-info">
-          Real-world factors that appear in a case multiple times.
-        </div></div>
-        <div class="sect-fill"> </div>
-        <div class="sect-right">
-          <input class="form-index" type="text" id="ent-idx-lu"
-            name="ent-idx-lu">
-          <button class="index-add" type="button"
-            onclick="entAddIndex()">?</button>
-        </div>
-      </div>
-      <input type="hidden" id="ent-idx-script" value="%s">
-      <input type="hidden" id="ent-idx-caseid" value="%s">
-      <input type="hidden" id="ent-idx-cnt" name="ent-idx-cnt" value="%d">
-      <div class="index-list" id="ent-idx-list">%s
-      </div>
-    </div>
+    </div>%s
 
     <div class="sect">
       <div class="sect-head">
@@ -3362,6 +3384,31 @@ class Client
     </div>'
 
 
+    #Entry form for indexes
+    FormEntryIndex = '
+
+    <div class="sect">
+      <div class="sect-head">
+        <div class="sect-label">Indexes</div>
+        <div class="tip"><div class="tip-disp"></div><div class="tip-info">
+          Real-world factors that appear in a case multiple times.
+        </div></div>
+        <div class="sect-fill"> </div>
+        <div class="sect-right">
+          <input class="form-index" type="text" id="ent-idx-lu"
+            name="ent-idx-lu">
+          <button class="index-add" type="button"
+            onclick="entAddIndex()">?</button>
+        </div>
+      </div>
+      <input type="hidden" id="ent-idx-script" value="%s">
+      <input type="hidden" id="ent-idx-caseid" value="%s">
+      <input type="hidden" id="ent-idx-cnt" name="ent-idx-cnt" value="%d">
+      <div class="index-list" id="ent-idx-list">%s
+      </div>
+    </div>'
+
+
   # Entry form tag each
   FormEntryTagEach = '
         <div>
@@ -3816,12 +3863,61 @@ class Client
   #
   def _form_config(env)
     cfg = env['icfs'].config
-    tz = cfg.get('tz')
-    rel_time = cfg.get('rel_time') ? 'true' : 'false'
-    return FormConfig % [tz, rel_time]
+
+    items = cfg.setup.map do |key, opt|
+      input = opt[:input]
+      input_string = case input[0]
+      when :text
+        '<input class="%s" name="%s" type="text" value="%s">' % [
+          input[1],
+          opt[:label],
+          cfg.set?(key) ? Rack::Utils.escape_html(cfg.get(key)) : ''
+        ]
+      when :boolean
+        '<input class="form-boolean" name="%s" type="text" value="%s">' % [
+          opt[:label],
+          cfg.set?(key) ? (cfg.get(key) ? 'true' : 'false') : ''
+        ]
+      when :select
+        items = [ '<option value=""></option>' ]
+        cur = cfg.set?(key) ? cfg.get(key) : false
+        input[3].each do |it|
+          sel = (it[0] == cur) ? ' selected' : ''
+          items << '<option value="%s"%s>%s</option>' % [it[0], sel, it[1]]
+        end
+        '<select class="%s" name="%s">%s</select>' % [
+          input[1],
+          input[2],
+          items.join('')
+        ]
+      else
+        raise(ArgumentError, 'Invalid Config setup')
+      end
+
+      FormConfigItem % [
+        opt[:name],
+        input_string,
+        opt[:tip],
+        _util_config(cfg, key, cfg.default(key))
+      ]
+    end
+
+    return FormConfig % items.join('')
   end # def _form_config()
 
 
+  # Item on the config form
+  FormConfigItem = '
+  <div class="form-row">
+    <div class="list-label">%s:</div>
+    %s
+    <div class="tip"><div class="tip-disp"></div><div class="tip-info">
+      %s
+      Default is: %s
+    </div></div>
+  </div>'.freeze
+
+
   # Config form
   FormConfig = '
     <div class="sect">
@@ -3830,22 +3926,8 @@ class Client
         <div class="tip"><div class="tip-disp"></div><div class="tip-info">
           Configuration settings.
         </div></div>
-        <div class="sect-fill"> </div>
-      </div>
-      <div class="form-row">
-        <div class="list-label">Timezone:</div>
-        <input class="form-tz" name="cfg-tz" type="text" value="%s">
-        <div class="tip"><div class="tip-disp"></div><div class="tip-info">
-          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 class="sect-fill"></div>
+      </div>%s
     </div>'
 
 
@@ -3938,7 +4020,7 @@ class Client
   ###############################################
   # Entry edit
   #
-  def _post_entry(env, para)
+  def _post_entry(env, para, opts={})
     return nil unless para['ent-ena'] == 'true'
 
     api = env['icfs']
@@ -3975,15 +4057,17 @@ class Client
     ent['tags'] = tags.uniq.sort unless tags.empty?
 
     # indexes
-    index = []
-    icnt = para['ent-idx-cnt'].to_i
-    raise(Error::Interface, 'Too many indexes') if(icnt > 100)
-    icnt.times do |ix|
-      tx = 'ent-idx-%d' % (ix + 1)
-      xnum = para[tx].to_i
-      index << xnum unless xnum == 0
+    unless opts[:no_index]
+      index = []
+      icnt = para['ent-idx-cnt'].to_i
+      raise(Error::Interface, 'Too many indexes') if(icnt > 100)
+      icnt.times do |ix|
+        tx = 'ent-idx-%d' % (ix + 1)
+        xnum = para[tx].to_i
+        index << xnum unless xnum == 0
+      end
+      ent['index'] = index.uniq.sort unless index.empty?
     end
-    ent['index'] = index.uniq.sort unless index.empty?
 
     # perms
     perms = []
@@ -4161,11 +4245,25 @@ class Client
   # Config edit
   #
   def _post_config(env, para)
-    cfg = {
-      'tz' => para['cfg-tz'],
-      'rel_time' => (para['cfg-reltime'].downcase == 'true' ? true : false),
-    }
-    return cfg
+    api = env['icfs']
+    cfg = api.config
+
+    vals = {}
+    cfg.setup.each do |key, opt|
+      val = para[opt[:label]]
+      next if val.nil? || val.empty?
+
+      case opt[:parse]
+      when :text
+        vals[key] = val
+      when :boolean
+        vals[key] = (val.downcase == 'true') ? true : false
+      else
+        raise(ArgumentError, 'Invalid config parser')
+      end
+    end
+
+    return vals
   end # def _post_config()
 
 
@@ -4491,6 +4589,26 @@ class Client
   end # def _verb_getpost()
 
 
+  ###############################################
+  # Display the config value
+  #
+  def _util_config(cfg, key, val)
+    opt = cfg.setup(key)
+
+    case opt[:input][0]
+    when :text
+      return val
+    when :boolean
+      return val ? 'true' : 'false'
+    when :select
+      opt[:input][3].each{|ary| return ary[1] if ary[0] == val }
+      return 'Invalid select option'
+    else
+      raise(ArgumentError, 'Unsupported config display type')
+    end
+  end # def _util_config
+
+
   ###############################################
   # Process the POST
   #
@@ -4608,7 +4726,7 @@ class Client
   def _resp(env, res, body)
     html = Page % [
       env['icfs.page'],
-      @css,
+      env['icfs'].config.get('css'),
       @js,
       body
     ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icfs
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Graham A. Field
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies: []
 description: |2-
 
@@ -24,6 +24,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- data/icfs-dark.css
 - data/icfs.css
 - data/icfs.js
 - devel/demo/ssl_gen.rb
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Investigative Case File System