Added test for html -> plain text (#7)

Test passed; this was fixed in commit 7e36fff0f1 which has yet to be deployed

.gitignore

@@ -331,3 +331,4 @@ ASALocalRun/
 
 ### --- ###
 src/PrayerTracker/appsettings.json
+docs/_site

README.md

@@ -1,5 +1,7 @@
 # PrayerTracker
 
+[![Build status](https://ci.appveyor.com/api/projects/status/j5nt9o3pu7er7hyi/branch/master?svg=true)](https://ci.appveyor.com/project/danieljsummers/prayertracker/branch/master)
+
 ### Visit the Site
 
 https://prayer.bitbadger.solutions

docs/CNAME

@@ -0,0 +1 @@
+docs.prayer.bitbadger.solutions

docs/Gemfile

@@ -0,0 +1,24 @@
+source "https://rubygems.org"
+
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
+# uncomment the line below. To upgrade, run `bundle update github-pages`.
+gem "github-pages", group: :jekyll_plugins
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+

docs/Gemfile.lock

@@ -0,0 +1,246 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.10)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
+    colorator (1.1.0)
+    commonmarker (0.17.13)
+      ruby-enum (~> 0.5)
+    concurrent-ruby (1.1.4)
+    dnsruby (1.61.2)
+      addressable (~> 2.5)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    eventmachine (1.2.7)
+    execjs (2.7.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.10.0)
+    forwardable-extended (2.6.0)
+    gemoji (3.0.0)
+    github-pages (197)
+      activesupport (= 4.2.10)
+      github-pages-health-check (= 1.16.1)
+      jekyll (= 3.7.4)
+      jekyll-avatar (= 0.6.0)
+      jekyll-coffeescript (= 1.1.1)
+      jekyll-commonmark-ghpages (= 0.1.5)
+      jekyll-default-layout (= 0.1.4)
+      jekyll-feed (= 0.11.0)
+      jekyll-gist (= 1.5.0)
+      jekyll-github-metadata (= 2.12.1)
+      jekyll-mentions (= 1.4.1)
+      jekyll-optional-front-matter (= 0.3.0)
+      jekyll-paginate (= 1.1.0)
+      jekyll-readme-index (= 0.2.0)
+      jekyll-redirect-from (= 0.14.0)
+      jekyll-relative-links (= 0.6.0)
+      jekyll-remote-theme (= 0.3.1)
+      jekyll-sass-converter (= 1.5.2)
+      jekyll-seo-tag (= 2.5.0)
+      jekyll-sitemap (= 1.2.0)
+      jekyll-swiss (= 0.4.0)
+      jekyll-theme-architect (= 0.1.1)
+      jekyll-theme-cayman (= 0.1.1)
+      jekyll-theme-dinky (= 0.1.1)
+      jekyll-theme-hacker (= 0.1.1)
+      jekyll-theme-leap-day (= 0.1.1)
+      jekyll-theme-merlot (= 0.1.1)
+      jekyll-theme-midnight (= 0.1.1)
+      jekyll-theme-minimal (= 0.1.1)
+      jekyll-theme-modernist (= 0.1.1)
+      jekyll-theme-primer (= 0.5.3)
+      jekyll-theme-slate (= 0.1.1)
+      jekyll-theme-tactile (= 0.1.1)
+      jekyll-theme-time-machine (= 0.1.1)
+      jekyll-titles-from-headings (= 0.5.1)
+      jemoji (= 0.10.2)
+      kramdown (= 1.17.0)
+      liquid (= 4.0.0)
+      listen (= 3.1.5)
+      mercenary (~> 0.3)
+      minima (= 2.5.0)
+      nokogiri (>= 1.8.5, < 2.0)
+      rouge (= 2.2.1)
+      terminal-table (~> 1.4)
+    github-pages-health-check (1.16.1)
+      addressable (~> 2.3)
+      dnsruby (~> 1.60)
+      octokit (~> 4.0)
+      public_suffix (~> 3.0)
+      typhoeus (~> 1.3)
+    html-pipeline (2.10.0)
+      activesupport (>= 2)
+      nokogiri (>= 1.4)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.7.4)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
+      mercenary (~> 0.3.3)
+      pathutil (~> 0.9)
+      rouge (>= 1.7, < 4)
+      safe_yaml (~> 1.0)
+    jekyll-avatar (0.6.0)
+      jekyll (~> 3.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-commonmark (1.2.0)
+      commonmarker (~> 0.14)
+      jekyll (>= 3.0, < 4.0)
+    jekyll-commonmark-ghpages (0.1.5)
+      commonmarker (~> 0.17.6)
+      jekyll-commonmark (~> 1)
+      rouge (~> 2)
+    jekyll-default-layout (0.1.4)
+      jekyll (~> 3.0)
+    jekyll-feed (0.11.0)
+      jekyll (~> 3.3)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-github-metadata (2.12.1)
+      jekyll (~> 3.4)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-mentions (1.4.1)
+      html-pipeline (~> 2.3)
+      jekyll (~> 3.0)
+    jekyll-optional-front-matter (0.3.0)
+      jekyll (~> 3.0)
+    jekyll-paginate (1.1.0)
+    jekyll-readme-index (0.2.0)
+      jekyll (~> 3.0)
+    jekyll-redirect-from (0.14.0)
+      jekyll (~> 3.3)
+    jekyll-relative-links (0.6.0)
+      jekyll (~> 3.3)
+    jekyll-remote-theme (0.3.1)
+      jekyll (~> 3.5)
+      rubyzip (>= 1.2.1, < 3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-seo-tag (2.5.0)
+      jekyll (~> 3.3)
+    jekyll-sitemap (1.2.0)
+      jekyll (~> 3.3)
+    jekyll-swiss (0.4.0)
+    jekyll-theme-architect (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-cayman (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-dinky (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-hacker (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-leap-day (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-merlot (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-midnight (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-minimal (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-modernist (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-primer (0.5.3)
+      jekyll (~> 3.5)
+      jekyll-github-metadata (~> 2.9)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-slate (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-tactile (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-theme-time-machine (0.1.1)
+      jekyll (~> 3.5)
+      jekyll-seo-tag (~> 2.0)
+    jekyll-titles-from-headings (0.5.1)
+      jekyll (~> 3.3)
+    jekyll-watch (2.1.2)
+      listen (~> 3.0)
+    jemoji (0.10.2)
+      gemoji (~> 3.0)
+      html-pipeline (~> 2.2)
+      jekyll (~> 3.0)
+    kramdown (1.17.0)
+    liquid (4.0.0)
+    listen (3.1.5)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    mini_portile2 (2.4.0)
+    minima (2.5.0)
+      jekyll (~> 3.5)
+      jekyll-feed (~> 0.9)
+      jekyll-seo-tag (~> 2.1)
+    minitest (5.11.3)
+    multipart-post (2.0.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.13.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (3.0.3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rouge (2.2.1)
+    ruby-enum (0.7.2)
+      i18n
+    rubyzip (1.2.2)
+    safe_yaml (1.0.5)
+    sass (3.7.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  github-pages
+  tzinfo-data
+
+BUNDLED WITH
+   2.0.1

docs/_config.yml

@@ -0,0 +1,11 @@
+defaults:
+  -
+    scope:
+      path: "en"
+    values:
+      layout: "en"
+  -
+    scope:
+      path: "es"
+    values:
+      layout: "es"

docs/_layouts/en.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ page.title }} &#xab; PrayerTracker Help</title>
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://prayer.bitbadger.solutions/css/app.css" rel="stylesheet">
+    <link href="/css/help.css" rel="stylesheet">
+  </head>
+  <body>
+    <header class="pt-title-bar">
+      <section class="pt-title-bar-left"><span class="pt-title-bar-home"><a href="/" title="Home">PrayerTracker</a></span></section>
+      <section class="pt-title-bar-right">Help</section>
+    </header>
+    <div id="pt-body">
+      <header id="pt-language">
+        <div>
+          Language: English &bull;
+          <a href="{{ page.url | replace_first: "/en", "/es" }}">Esta pagina en español</a>
+        </div>
+      </header>
+      <h2 id="pt-page-title">{{ page.title }}</h2>
+      <div class="pt-content">
+        {{ content }}
+        <div class="pt-close-window">
+          <p class="pt-center-text">
+            <a href="#" title="Click to Close This Window" onclick="window.close();return false">
+              <i class="material-icons">cancel</i> Close Window
+            </a>
+          </p>
+        </div>
+        <div class="pt-help-index">
+          <p class="pt-center-text">
+            <a href="/en/" title="Help Index">&#xab; Back to Help Index</a>
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

docs/_layouts/es.html

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ page.title }} &#xab; Ayuda de SeguidorOración</title>
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://prayer.bitbadger.solutions/css/app.css" rel="stylesheet">
+    <link href="/css/help.css" rel="stylesheet">
+  </head>
+  <body>
+    <header class="pt-title-bar">
+      <section class="pt-title-bar-left"><span class="pt-title-bar-home"><a href="/" title="Home">SeguidorOración</a></span></section>
+      <section class="pt-title-bar-right">Ayuda</section>
+    </header>
+    <div id="pt-body">
+      <header id="pt-language">
+        <div>
+            Lengua: Español &bull;
+          <a href="{{ page.url | replace_first: "/es", "/en" }}">This page in English</a>
+        </div>
+      </header>
+      <h2 id="pt-page-title">{{ page.title }}</h2>
+      <div class="pt-content">
+        {{ content }}
+        {% if page.skip_footer %}
+        {% else %}
+          <div class="pt-close-window">
+            <p class="pt-center-text">
+              <a href="#" title="Haga Clic para Cerrar Esta Ventana" onclick="window.close();return false">
+                <i class="material-icons">cancel</i> Cerrar Esta Ventana
+              </a>
+            </p>
+          </div>
+          <div class="pt-help-index">
+            <p class="pt-center-text">
+              <a href="/es/" title="Índice de ayuda">&#xab; Volver al índice de ayuda</a>
+            </p>
+          </div>
+        {% endif %}
+      </div>
+    </div>
+  </body>
+</html>

docs/_layouts/home.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ page.title }} &#xab; PrayerTracker Help / Ayuda de SeguidorOración</title>
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <link href="https://prayer.bitbadger.solutions/css/app.css" rel="stylesheet">
+    <link href="/css/help.css" rel="stylesheet">
+  </head>
+  <body>
+    <header class="pt-title-bar">
+      <section class="pt-title-bar-left"><span class="pt-title-bar-home"><a href="/" title="Home">PrayerTracker / SeguidorOración</a></span></section>
+      <section class="pt-title-bar-right">Help / Ayuda</section>
+    </header>
+    <div id="pt-body">
+      <header id="pt-language">
+        <div>&nbsp;</div>
+      </header>
+      <h2 id="pt-page-title">{{ page.title }}</h2>
+      <div class="pt-content pt-center-text">
+        {{ content }}
+      </div>
+    </div>
+  </body>
+</html>

docs/css/help.css

@@ -0,0 +1,43 @@
+/**
+ * PrayerTracker Help styling
+ */
+.pt-content {
+  background-color: white;
+  padding: 0 .25em;
+}
+.pt-title-bar-home {
+  height: 2rem;
+}
+.pt-title-bar-left {
+  color: white;
+  font-size: 1.25rem;
+  font-weight: bold;
+  margin-left: .5rem;
+}
+.pt-title-bar-right {
+  color: white;
+  color: rgba(255, 255, 255, .75);
+  font-size: 1.1rem;
+  font-variant: small-caps;
+  margin-right: 1rem;
+  align-self: center;
+}
+h2 {
+  margin-top: 0;
+  padding-left: .5rem;
+  border-bottom: solid 1px #444;
+}
+.pt-close-window, .pt-help-index {
+  font-size: 1.25rem;
+}
+.pt-help-index {
+  display: none;
+}
+@media screen and (min-width:451px) {
+  .pt-close-window {
+    display: none;
+  }
+  .pt-help-index {
+    display: block;
+  }
+}

docs/en/index.md

@@ -0,0 +1,26 @@
+---
+title: Help
+skip_footer: true
+---
+
+Throughout PrayerTracker, you'll see an icon (a question mark in a circle) next to the title on each page. Clicking this will open a new, small window with directions on using that page. If you are looking for a quick overview of PrayerTracker, start with the “Add / Edit a Request” and “Change Preferences” entries.
+
+----
+
+<p class="pt-center-text"><strong>Help Topics</strong></p>
+
+[Change Preferences](./small-group/preferences.html)
+
+[Send Announcement](./small-group/announcement.html)
+
+[Maintain Group Members](./small-group/members.html)
+
+[Add / Edit a Request](./requests/edit.html)
+
+[Maintain Requests](./requests/maintain.html)
+
+[View Request List](./requests/view.html)
+
+[Log On](./user/log-on.html)
+
+[Change Your Password](./user/password.html)

docs/en/requests/edit.md

@@ -0,0 +1,27 @@
+---
+title: Add / Edit a Request
+---
+
+This page allows you to enter or update a new prayer request.
+
+## Request Type
+
+There are 5 request types in PrayerTracker. “Current Requests” are your regular requests that people may have regarding things happening over the next week or so. “Long-Term Requests” are requests that may occur repeatedly or continue indefinitely. “Praise Reports” are like “Current Requests”, but they are answers to prayer to share with your group. “Expecting” is for those who are pregnant. “Announcements” are like “Current Requests”, but instead of a request, they are simply passing information along about something coming up.
+
+The order above is the order in which the request types appear on the list. “Long-Term Requests” and “Expecting” are not subject to the automatic expiration (set on the “Change Preferences” page) that the other requests are.
+
+## Date
+
+For new requests, this is a box with a calendar date picker. Click or tab into the box to display the calendar, which will be preselected to today's date. For existing requests, there will be a check box labeled “Check to not update the date”. This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request.
+
+## Requestor / Subject
+
+For requests or praises, this field is for the name of the person who made the request or offered the praise report. For announcements, this should contain the subject of the announcement. For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates.
+
+## Expiration
+
+“Expire Normally” means that the request is subject to the expiration days in the group preferences. “Request Never Expires” can be used to make a request never expire (note that this is redundant for “Long-Term Requests” and “Expecting”). If you are editing an existing request, a third option appears. “Expire Immediately” will make the request expire when it is saved. Apart from the icons on the request maintenance page, this is the only way to expire “Long-Term Requests” and “Expecting” requests, but it can be used for any request type.
+    
+## Request
+
+This is the text of the request. The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself. It also supports undo and redo, and the editor supports full-screen mode. Hover over each icon to see what each button does.

docs/en/requests/maintain.md

@@ -0,0 +1,25 @@
+---
+title: Maintain Requests
+---
+
+From this page, you can add, edit, and delete your current requests. You can also restore requests that may have expired, but should be made active once again.
+
+## Add a New Request
+
+To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group.
+
+## Edit Request
+      
+To edit a request, click the blue pencil icon; it's the first icon under the “Actions” column heading.
+
+## Expire a Request
+
+For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately. This is equivalent to editing the request, selecting “Expire Immediately”, and saving it.
+
+## Restore an Inactive Request
+
+When the page is first displayed, it does not display inactive requests. However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown. The middle icon will look like an eye; clicking it will restore the request as an active request. The last updated date will be current, and the request is set to expire normally.
+
+## Delete a Request
+
+Deleting a request is contrary to the intent of PrayerTracker, as you can retrieve requests that have expired. However, if there is a request that needs to be deleted, clicking the blue trash can icon in the “Actions” column will allow you to do it. Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good.

docs/en/requests/view.md

@@ -0,0 +1,17 @@
+---
+title: View Request List
+---
+
+From this page, you can view the request list (for today or for the next Sunday), view a printable version of the list, and e-mail the list to the members of your group. (NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)
+
+## List for Next Sunday
+      
+This will modify the date for the list, so it will look like it is currently next Sunday. This can be used, for example, to see what requests will expire, or allow you to print a list with Sunday's date on Saturday evening. Note that this link does not appear if it is Sunday.
+
+## View Printable
+
+Clicking this link will display the list in a format that is suitable for printing; it does not have the normal PrayerTracker header across the top. Once you have clicked the link, you can print it using your browser's standard “Print” functionality.
+
+## Send Via E-mail
+
+Clicking this link will send the list you are currently viewing to your group members. The page will remind you that you are about to do that, and ask for your confirmation. If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like. You may safely use your browser's “Back” button to navigate away from the page.

docs/en/small-group/announcement.md

@@ -0,0 +1,11 @@
+---
+title: Send Announcement
+---
+
+## Announcement Text
+
+This is the text of the announcement you would like to send. It functions the same way as the text box on the [“Edit Request” page](../requests/edit.html#request).
+
+## Add to Request List
+
+Without this box checked, the text of the announcement will only be e-mailed to your group members. If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected.

docs/en/small-group/members.md

@@ -0,0 +1,17 @@
+---
+title: Maintain Group Members
+---
+
+From this page, you can add, edit, and delete the e-mail addresses for your group.
+
+## Add a New Group Member
+
+To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group.
+
+## Edit Group Member
+
+To edit an e-mail address, click the blue pencil icon; it's the first icon under the “Actions” column heading. This will allow you to update the name and/or the e-mail address for that member.
+
+## Delete a Group Member
+
+To delete an e-mail address, click the blue trash can icon in the “Actions” column. Note that once an e-mail address has been deleted, it is gone. (Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)

docs/en/small-group/preferences.md

@@ -0,0 +1,62 @@
+---
+title: Change Preferences
+---
+
+This page allows you to change how your prayer request list looks and behaves. Each section is addressed below.
+
+## Requests Expire After
+
+When a regular request goes this many days without being updated, it expires and no longer appears on the request list. Note that the categories “Long-Term Requests” and “Expecting” never expire automatically.
+
+## Requests “New” For
+
+Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests. All categories respect this setting. If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet. (NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)
+
+## Long-Term Requests Alerted for Update
+
+Requests that have not been updated in this many weeks are identified by an italic font on the “Maintain Requests” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current.
+
+## Request Sorting
+
+By default, requests are sorted within each group by the last updated date, with the most recent on top. If you would prefer to have the list sorted by requestor or subject rather than by date, select “Sort by Requestor Name” instead.
+
+## E-mail “From” Name and Address
+
+PrayerTracker must put an name and e-mail address in the “from” position of each e-mail it sends. The default name is “PrayerTracker”, and the default e-mail address is “prayer@djs-consulting.com”. This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address). Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly.
+
+## E-mail Format
+
+"This is the default e-mail format for your group. The PrayerTracker default is HTML, which sends the list just as you see it online. However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting. The setting on this page is the group default; you can select a format for each recipient on the “Maintain Group Members” page.
+
+## Colors
+
+You can customize the colors that are used for the headings and lines in your request list. You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255. There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic. The background color cannot be changed.
+
+## Fonts for List
+
+This is a comma-separated list of fonts that will be used for your request list. A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font. It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”. You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font.
+
+## Heading / List Text Size
+
+This is the point size to use for each. The default for the heading is 16pt, and the default for the text is 12pt.
+
+## Making a “Large Print” List
+
+If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:
+
+> _Fonts_<br>
+> &#8212; 'Times New Roman',serif
+>
+> _Heading Text Size_<br>
+> &#8212; 18pt
+>
+> _List Text Size_<br>
+> &#8212; 16pt
+
+## Time Zone
+
+This is the time zone that you would like to use for your group. If you do not see your time zone listed, just [contact Daniel](mailto:daniel@djs-consulting.com?subject=PrayerTracker%20Time%20Zone) and tell him what time zone you need.
+
+## Request List Visibility
+
+The group's request list can be either public, private, or password-protected. Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator). Password-protected lists allow group members to log in and view the current request list online, using the “Group Log On” link and providing this password. As this is a shared password, it is stored in plain text, so you can easily see what it is. If you select “Password Protected” but do not enter a password, the list remains private, which is also the default value. (Changing this password will force all members of the group who logged in with the “Remember Me” box checked to provide the new password.)

docs/en/user/log-on.md

@@ -0,0 +1,13 @@
+---
+title: Log On
+---
+
+This page allows you to log on to PrayerTracker. There are two different levels of access for PrayerTracker - user and group.
+
+## User Log On
+
+Enter your e-mail address and password into the appropriate boxes, then select your group. If you want PrayerTracker to remember you on your computer, click the “Remember Me” box before clicking the “Log On” button.
+
+## Group Log On
+
+If your group has defined a password to use to allow you to view their request list online, select your group from the drop down list, then enter the group password into the appropriate box. If you want PrayerTracker to remember your group, click the “Remember Me” box before clicking the “Log On” button.

docs/en/user/password.md

@@ -0,0 +1,7 @@
+---
+title: Change Your Password
+---
+
+This page will let you change your password. Enter your existing password in the top box, then enter your new password in the bottom two boxes. Entering your existing password is a security measure; with the “Remember Me” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password.
+
+"If you cannot remember your existing password, we cannot retrieve it, but we can set it to something known so that you can then change it to your password. [Click here to request help resetting your password](mailto:daniel@djs-consulting.com?subject=PrayerTracker%20Password%20Help).

docs/es/index.md

@@ -0,0 +1,26 @@
+---
+title: Ayuda
+skip_footer: true
+---
+
+En todo el sistema, verá un icono (un signo de interrogación en un círculo) junto al título de cada página. Al hacer clic en esta opción, se abrirá una nueva y pequeña ventana con instrucciones sobre cómo usar esa página. Si está buscando una descripción rápida de SeguidorOración, comience con las entradas "Agregar / Editar una Petición" y "Cambiar las Preferencias".
+
+----
+
+<p class="pt-center-text"><strong>Los Temas de Ayuda</strong></p>
+
+[Cambiar las Preferencias](./small-group/preferences.html)
+
+[Enviar un Anuncio](./small-group/announcement.html)
+
+[Mantener los Miembros del Grupo](./small-group/members.html)
+
+[Agregar / Editar una Petición](./requests/edit.html)
+
+[Mantener las Peticiones](./requests/maintain.html)
+
+[Ver la Lista de Peticiones](./requests/view.html)
+
+[Iniciar Sesión](./user/log-on.html)
+
+[Cambiar Su Contraseña](./user/password.html)

docs/es/requests/edit.md

@@ -0,0 +1,27 @@
+---
+title: Agregar / Editar una Petición
+---
+
+Esta página le permite introducir o actualizar una petición de oración nueva.
+
+## Tipo de Petición
+
+Hay 5 tipos de peticiones en SeguidorOración. “Peticiones Actuales” son sus peticiones habituales que la gente pueda tener acerca de las cosas que suceden durante la próxima semana o así. “Peticiones a Largo Plazo” son peticiones que pueden ocurrir varias veces, o continuar indefinidamente. “Informes de Alabanza” son como “Peticiones Actuales”, pero son respuestas a la oración para compartir con su grupo. “Embarazada” es para aquellos que están embarazadas. “Anuncios” son como “Peticiones Actuales”, pero en lugar de una petición, simplemente se pasa la información a lo largo de algo por venir.
+
+El orden anterior es el orden en que los tipos de peticiones aparecen en la lista. “Peticiones a Largo Plazo” y “Embarazada” no están sujetos a la caducidad automática (establecida en el “Cambiar las Preferencias” de la página) que las peticiones son otros.
+
+## Fecha
+
+Para nuevas peticiones, se trata de una caja con un selector de fechas del calendario. Haga clic en la pestaña o en la caja para mostrar el calendario, que será preseleccionada para la fecha de hoy. Para peticiones existentes, habrá una casilla de verificación “Seleccionar para no actualizar la fecha”. Esto puede ser usado si corrige la ortografía ni la puntuacion, y no tienen una actualización real de hacer la petición.
+
+## Peticionario / Sujeto
+
+Para las peticiones o alabanzas, este campo es el nombre de la persona que hizo la petición o que ofrece el informe de alabanza. Para los anuncios, este debe contener el objeto del anuncio. Para todos los tipos, es opcional, yo solía tener un anuncio con ningún tema que iba todas las semanas, diciendo a dónde enviar peticiones y actualizaciones.
+
+## Expiración
+
+“Expirará Normalmente” significa que la petición está sujeta a los días de vencimiento de las preferencias del grupo. “Petición no Expira Nunca” se puede utilizar para hacer una petición que no caduque nunca (nótese que esto es redundante para los tipos “Peticiones a Largo Plazo” y “Embarazada”). Si está editando una petición existente, aparece una tercera opción. “Expirará Inmediatamente” hará que la petición expirará cuando se guarda. Aparte de los iconos de la página de mantenimiento de las peticiones, ésta es la única otra forma de expirar peticiones del tipos “Peticiones a Largo Plazo” y “Embarazada”, pero puede ser utilizada para cualquier tipo de petición.
+
+## Petición
+
+Este es el texto de la petición. El editor ofrece muchas capacidades de formato, como "El Corrector Ortográfico al Escribir" (habilitado predeterminado), "Pegar desde Word" y "Pegar sin formato", así como "Código Fuente" punto de vista, si quieres editar el código HTML usted mismo. También es compatible con deshacer y rehacer, y el editor soporta modo de pantalla completa. Pase el ratón sobre cada icono para ver qué hace cada botón.

docs/es/requests/maintain.md

@@ -0,0 +1,25 @@
+---
+title: Mantener las Peticiones
+---
+
+Desde esta página, usted puede agregar, editar y borrar sus peticiones actuales. También puede restaurar peticiones que han caducado, sino que debe ser activa, una vez más.
+
+## Agregar una Nueva Petición
+
+Para agregar una petición, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de peticiones para su grupo.
+
+## Editar la Petición
+
+Para editar una petición, haga clic en el icono de lápiz azul, el primer icono bajo el título de columna “Acciones”.
+
+## Expirar una petición
+
+Para las peticiones activas, el segundo icono es un ojo con una barra a través de él; Si hace clic en este icono, la petición se cancelará inmediatamente. Esto equivale a editar la petición, seleccionar "Expirará Inmediatamente" y guardarla.
+
+## Restaurar una Petición Inactivo
+
+Cuando la página se muestra por primera vez, que no muestra peticiones inactivos. Sin embargo, al hacer clic en el vínculo en la parte inferior de la página se actualizará la página con las peticiones se muestran inactivos. El icono del centro se verá como un ojo; Haciendo clic en él, restaurará la petición como una petición activa. La última fecha actualizada será actual, y la petición se establece para caducar normalmente.
+
+## Eliminar una Petición
+
+Eliminación de una petición es contraria a la intención de SeguidorOración, como se puede recuperar peticiones que han expirado. Sin embargo, si hay una solicitud que debe ser eliminado, haga clic en el icono azul de la papelera en la columna “Acciones” le permitirá hacerlo. Utilice esta opción con cuidado, ya que estas supresiones no se puede deshacer, una vez a la petición se ha borrado, ha desaparecido para siempre.

docs/es/requests/view.md

@@ -0,0 +1,17 @@
+---
+title: Ver la Lista de Peticiones
+---
+
+Desde esta página, puede ver la lista de peticiones (para hoy o para el próximo Domingo), ver una versión imprimible de la lista, y por correo electrónico la lista de los miembros de su grupo. (NOTA: Si usted está registrado como miembro de la clase, la única opción que se ve es para ver una lista para imprimir.)
+
+## Lista para el Próximo Domingo
+
+Esto modificará la fecha de la lista, por lo que se verá como es en la actualidad el próximo Domingo. Esto puede ser usado, por ejemplo, para ver lo que peticiones de caducidad, ni le permite imprimir una lista con la fecha del Domingo en la noche del Sábado. Tenga en cuenta que este enlace no aparece si es Domingo.
+
+## Versión Imprimible
+
+Hacer clic en este vínculo, se muestra la lista en un formato que sea adecuado para imprimir, sino que no tiene el encabezado normal de SeguidorOración en la parte superior. Una vez que haya hecho clic en el enlace, se puede imprimir con el navegador estándar de “Imprimir” funcionalidad.
+
+## Enviar por correo electrónico
+
+Al hacer clic en este enlace le enviará la lista que está viendo en ese momento a los miembros del grupo. La página te recordará que estás a punto de hacerlo, y pedir su confirmación. Si continúa, usted verá una página que muestra a la que la lista fue enviado, y lo que la lista parecía. Usted puede utilizar con seguridad de su navegador botón “Atrás” para navegar fuera de la página.

docs/es/small-group/announcement.md

@@ -0,0 +1,11 @@
+---
+title: Enviar un Anuncio
+---
+
+## Texto del Anuncio
+
+Este es el texto del anuncio que desea enviar. Funciona de la misma forma que el cuadro de texto en [la página “Editar la Petición”](../requests/edit.html#peticion).
+
+## Agregar a la Lista de Peticiones En
+
+Sin esta caja marcada, el texto del anuncio sólo será por correo electrónico a los miembros del su grupo. Si marca esta caja, sin embargo, el texto del anuncio será añadido a su lista de oración en la sección que ha seleccionado.

docs/es/small-group/members.md

@@ -0,0 +1,17 @@
+---
+title: Mantener los Miembros del Grupo
+---
+
+Desde esta página, usted puede agregar, editar y eliminar las direcciones de correo electrónico para su grupo.
+
+## Añadir un Nuevo Miembro del Grupo
+
+Para agregar una dirección de correo electrónico, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de direcciones para su grupo.
+
+## Editar el Miembro del Grupo
+
+Para editar una dirección de correo electrónico, haga clic en el icono de lápiz azul, es el primer icono bajo el título de columna “Acciones”. Esto le permitirá actualizar el nombre y / o la dirección de correo electrónico para ese miembro.
+
+## Eliminar un Miembro del Grupo
+
+Para eliminar una dirección de correo electrónico, haga clic en el icono azul de la papelera en la columna “Acciones”. Tenga en cuenta que una vez que la dirección de correo electrónico se ha eliminado, se ha ido. (Por supuesto, si usted lo elimine por error, se puede entrar de nuevo utilizando la opción “Agregar” instrucciones de arriba.)

docs/es/small-group/preferences.md

@@ -0,0 +1,62 @@
+---
+title: Cambiar las Preferencias
+---
+
+Esta página le permite cambiar la forma en que su lista de peticiones de la oración se ve y se comporta. Cada sección se aborda más adelante.
+
+## Peticiones Expiran Después de
+
+Cuando una petición regular va esta cantidad de días sin actualizar, caduca y ya no aparece en la lista de peticiones. Tenga en cuenta que las categorías “Peticiones a Largo Plazo” y “Embarazada” no expirará automáticamente.
+
+## Peticiones “Nuevas” Para
+
+Peticiones que han sido actualizadas dentro de esta cantidad de días se identifican por un círculo hueco para su bala, en oposición a un círculo relleno para otras peticiones. Todas las categorías respetar esta opción. Si usted hace una corrección de errata en una petición, si no marque la caja para actualizar la fecha, este valor va a cambiar la bala. (NOTA: En el texto sin formato de correo electrónico, las nuevas solicitudes se identifican con un símbolo “+”, y pide a los viejos se identifican con un símbolo “-”.)
+
+## Peticiones a Largo Plazo Alertó para la Actualización
+
+Peticiones que no han sido actualizados en esta semana muchos se identifican con un tipo de letra cursiva en la página “Mantener las Peticiones”, para recordarle que debe buscar novedades en estas peticiones para que vuestras oraciones pueden permanecer relevante y actual.
+
+## Orden de Peticiones
+
+De forma predeterminada, las solicitudes se ordenan dentro de cada grupo por la última fecha de actualización, con el más reciente en la parte superior. Si prefiere tener la lista ordenada por el solicitante o el sujeto en vez de por fecha, seleccione “Ordenar por Nombre del Solicitante” en su lugar.
+
+## Correo Electrónico “De” Nombre y Dirección
+
+SeguidorOración debe poner el nombre y la dirección de correo electrónico en el “de” posición de cada correo electrónico que envía. El nombre predeterminado es “PrayerTracker”, y el valor predeterminado dirección de correo electrónico es “prayer@djs-consulting.com”. Esto funciona, pero los mensajes devueltos, y las respuestas de fuera de la oficina serán enviados a esa dirección (que no es ni siquiera una dirección real). Cambiar por lo menos la dirección de correo electrónico a su dirección se asegurará de que usted recibe estos correos electrónicos, y se puede podar su lista de correo electrónico en consecuencia.
+
+## Formato de Correo Electrónico
+
+Este es el valor predeterminado formato de correo electrónico para su grupo. El valor predeterminado de SeguidorOración es HTML, el cual envía la lista al igual que usted lo ve en el sitio. Sin embargo, algunos clientes de correo electrónico no puede mostrar esto correctamente, para que pueda elegir el correo electrónico a un formato de texto plano predeterminadas, que no tiene colores, cursiva, u otro formato. La configuración en esta página es el valor predeterminado del grupo, se puede seleccionar un formato para cada destinatario de la página “Mantener los Miembros del Grupo”.
+
+## Colores
+
+Usted puede personalizar los colores que se utilizan para las partidas y líneas en su lista de peticiones. Puede seleccionar uno de los 16 colores con nombre en las listas desplegables, o puede “mezclar su propia” en colores rojo, verde y azul (RGB) valores entre 0 y 255. Hay un enlace en la parte inferior de la página para una lista de colores con más nombres y sus valores RGB, si realmente estás sintiendo artística. El color de fondo no puede ser cambiado.
+
+## Fuentes de la Lista
+
+Esta es una lista separada por comas de fuentes que se utilizarán para su lista de peticiones. Una advertencia de que es bueno aquí, sólo porque usted tiene una fuente oscura y gusta la forma en que se vea no significa que los demás tienen de que la misma fuente. Generalmente es mejor quedarse con las fuentes que vienen con Windows - Fuentes como “Arial”, “Times New Roman”, “Tahoma”, y “Comic Sans MS”. También debe poner fin a la lista de fuentes, ya sea con “serif” o el “sans-serif”, que utilizará el fuente serif predeterminado (como “Times New Roman”) o el fuente sans-serif predeterminado (como “Arial”).
+
+## Tamaño del Texto de Partida y Lista
+
+Este es el tamaño de punto a utilizar para cada uno. El valor predeterminado para el título es 16 puntos, y el valor por defecto para el texto es 12 puntos.
+
+## Realización de una Lista de “Letra Grande”
+
+Si el grupo está compuesta en su mayoría de la gente que prefiere letras grandes, los siguientes ajustes harán que su lista de parecerse a la típica la publicación “Letra Grande”:
+
+> _Fuentes_<br>
+> &#8212; 'Times New Roman',serif
+>
+> _Partida el Tamaño del Texto_<br>
+> &#8212; 18pt
+>
+> _Lista el Tamaño del Texto_<br>
+> &#8212; 16pt
+
+## Zona Horaria
+
+Esta es la zona horaria que desea utilizar para su clase. Si no puede ver la zona horaria en la lista, ponte en [contacto con Daniel](mailto:daniel@djs-consulting.com?subject=Zona%20Horaria%20por%20SeguidorOración) y decirle lo que la zona horaria que usted necesita.
+
+## La Visibilidad del la Lista de las Peticiones
+
+La lista de peticiones del grupo puede ser pública, privada o protegida por contraseña. Las listas públicas están disponibles sin iniciar sesión, y listas privadas sólo están disponibles en línea a los administradores (aunque la lista todavía puede ser enviado por correo electrónico por el administrador). Protegidos con contraseña listas permiten miembros del grupo iniciar sesión y ver la lista de peticiones actual en el sito, utilizando el "Iniciar Sesión como Grupo" enlace y proporcionar la contraseña. Como se trata de una contraseña compartida, se almacena en texto plano, así que usted puede ver fácilmente lo que es. Si selecciona "Protegido por Contraseña" pero no introduce una contraseña, la lista sigue siendo privado, que también es el valor predeterminado. (Cambiar esta contraseña obligará a todos los miembros del grupo que se iniciar sesión en el "Acuérdate de Mí" caja marcada para proporcionar la nueva contraseña.)

docs/es/user/log-on.md

@@ -0,0 +1,13 @@
+---
+title: Iniciar Sesión
+---
+
+Esta página le permite acceder a SeguidorOración. Hay dos diferentes niveles de acceso para SeguidorOración - el usuario y el grupo.
+
+## Iniciar Sesión como Usuario
+
+Introduzca su dirección de correo electrónico y contraseña en las cajas apropiadas y seleccione su grupo. Si desea que SeguidorOración que le recuerde en su ordenador, haga clic en “Acuérdate de Mí” caja antes de pulsar el “Iniciar Sesión” botón.
+
+## Iniciar Sesión como Grupo
+
+Si el grupo se ha definido una contraseña para usar que le permite ver su lista de peticiones en línea, seleccionar el grupo en la lista desplegable y introduzca la contraseña del grupo en la caja correspondiente. Si desea que SeguidorOración recuerde su grupo, haga clic en “Acuérdate de Mí” caja antes de pulsar el “Iniciar Sesión” botón.

docs/es/user/password.md

@@ -0,0 +1,7 @@
+---
+title: Cambiar Su Contraseña
+---
+
+Esta página le permitirá cambiar su contraseña. Ingrese su contraseña actual en la caja superior y introduzca la nueva contraseña en la parte inferior dos cajas. Al entrar su contraseña actual es una medida de seguridad, con el “Acuérdate de Mí” caja de la página inicio de sesión, esto evitará que otra persona que pueda estar usando su computadora de la posibilidad de simplemente ir a el sitio y cambiar la contraseña.
+
+Si no recuerdas tu contraseña actual, no podemos recuperar, pero podemos ponerlo en algo que se conoce de modo que usted puede cambiarlo a su contraseña. [Haga clic aquí para solicitar ayuda para restablecer su contraseña](mailto:daniel@djs-consulting.com?subject=Ayuda%20de%20Contraseña%20de%20SeguidorOración).

docs/index.md

@@ -0,0 +1,8 @@
+---
+title: Help / Ayuda
+layout: home
+---
+
+## [English](/en)
+
+## [Español](/es)

src/PrayerTracker.Data/DataAccess.fs

@@ -3,15 +3,11 @@ module PrayerTracker.DataAccess
 
 open FSharp.Control.Tasks.ContextInsensitive
 open Microsoft.EntityFrameworkCore
+open Microsoft.FSharpLu
 open PrayerTracker.Entities
 open System.Collections.Generic
 open System.Linq
 
-/// EF can return null for record types with the CLIMutable attribute; this converts a possibly-null record type to an
-/// option
-let optRec<'T> (r : 'T) =
-  match box r with null -> None | _ -> Some r
-
 type AppDbContext with
   
   (*-- DISCONNECTED DATA EXTENSIONS --*)
@@ -34,7 +30,7 @@ type AppDbContext with
   member this.TryChurchById cId =
     task {
       let! church = this.Churches.AsNoTracking().FirstOrDefaultAsync (fun c -> c.churchId = cId)
-      return optRec church
+      return Option.fromObject church
       }
       
   /// Find all churches
@@ -50,7 +46,7 @@ type AppDbContext with
   member this.TryMemberById mId =
     task {
       let! mbr = this.Members.AsNoTracking().FirstOrDefaultAsync (fun m -> m.memberId = mId)
-      return optRec mbr
+      return Option.fromObject mbr
       }
 
   /// Find all members for a small group
@@ -74,7 +70,7 @@ type AppDbContext with
   member this.TryRequestById reqId =
     task {
       let! req = this.PrayerRequests.AsNoTracking().FirstOrDefaultAsync (fun pr -> pr.prayerRequestId = reqId)
-      return optRec req
+      return Option.fromObject req
       }
 
   /// Get all (or active) requests for a small group as of now or the specified date
@@ -121,7 +117,7 @@ type AppDbContext with
         this.SmallGroups.AsNoTracking()
           .Include(fun sg -> sg.preferences)
           .FirstOrDefaultAsync (fun sg -> sg.smallGroupId = gId)
-      return optRec grp
+      return Option.fromObject grp
       }
 
   /// Get small groups that are public or password protected
@@ -176,7 +172,7 @@ type AppDbContext with
           .ToListAsync ()
       return grps
         |> Seq.map (fun grp -> grp.smallGroupId.ToString "N", sprintf "%s | %s" grp.church.name grp.name)
-        |> Map.ofSeq
+        |> List.ofSeq
       }
 
   /// Log on a small group
@@ -213,7 +209,7 @@ type AppDbContext with
   member this.TryTimeZoneById tzId =
     task {
       let! tz = this.TimeZones.FirstOrDefaultAsync (fun t -> t.timeZoneId = tzId)
-      return optRec tz
+      return Option.fromObject tz
       }
 
   /// Get all time zones
@@ -229,7 +225,7 @@ type AppDbContext with
   member this.TryUserById uId =
     task {
       let! user = this.Users.AsNoTracking().FirstOrDefaultAsync (fun u -> u.userId = uId)
-      return optRec user
+      return Option.fromObject user
       }
 
   /// Find a user by its e-mail address and authorized small group
@@ -239,14 +235,14 @@ type AppDbContext with
         this.Users.AsNoTracking().FirstOrDefaultAsync (fun u ->
             u.emailAddress = email
             && u.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
-      return optRec user
+      return Option.fromObject user
       }
 
   /// Find a user by its Id (tracked entity), eagerly loading the user's groups
   member this.TryUserByIdWithGroups uId =
     task {
       let! user = this.Users.Include(fun u -> u.smallGroups).FirstOrDefaultAsync (fun u -> u.userId = uId)
-      return optRec user
+      return Option.fromObject user
       }
 
   /// Get a list of all users
@@ -274,7 +270,7 @@ type AppDbContext with
           u.emailAddress = email
           && u.passwordHash = pwHash
           && u.smallGroups.Any (fun xref -> xref.smallGroupId = gId))
-      return optRec user
+      return Option.fromObject user
       }
 
   /// Find a user based on credentials stored in a cookie

src/PrayerTracker.Data/PrayerTracker.Data.fsproj

@@ -16,13 +16,14 @@
 
   <ItemGroup>
     <PackageReference Include="FSharp.EFCore.OptionConverter" Version="1.0.0" />
-    <PackageReference Include="NodaTime" Version="2.4.0" />
+    <PackageReference Include="Microsoft.FSharpLu" Version="0.10.30" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
+    <PackageReference Include="NodaTime" Version="2.4.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Update="FSharp.Core" Version="4.6.2" />
   </ItemGroup>
 
 </Project>

src/PrayerTracker.Tests/PrayerTracker.Tests.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Expecto" Version="8.4.2" />
+    <PackageReference Include="Expecto" Version="8.9.1" />
-    <PackageReference Include="Expecto.VisualStudio.TestAdapter" Version="10.0.0" />
+    <PackageReference Include="Expecto.VisualStudio.TestAdapter" Version="10.0.2" />
-    <PackageReference Include="NodaTime.Testing" Version="2.4.0" />
+    <PackageReference Include="NodaTime.Testing" Version="2.4.4" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Update="FSharp.Core" Version="4.6.2" />
   </ItemGroup>
 
 </Project>

src/PrayerTracker.Tests/UI/CommonFunctionsTests.fs

@@ -9,15 +9,6 @@ open PrayerTracker.Views
 open System.IO
 
 
-[<Tests>]
-let encLocTextTests =
-  testList "encLocText" [
-    test "succeeds" {
-      let enc = encLocText (LocalizedString ("test", "test&")) |> renderHtmlNode
-      Expect.equal enc "test&amp;" "string not encoded correctly"
-      }
-    ]
-
 [<Tests>]
 let iconSizedTests =
   testList "iconSized" [
@@ -36,6 +27,15 @@ let iconTests =
       }
     ]
 
+[<Tests>]
+let locStrTests =
+  testList "locStr" [
+    test "succeeds" {
+      let enc = locStr (LocalizedString ("test", "test&")) |> renderHtmlNode
+      Expect.equal enc "test&amp;" "string not encoded correctly"
+      }
+    ]
+
 [<Tests>]
 let namedColorListTests =
   testList "namedColorList" [

src/PrayerTracker.Tests/UI/UtilsTests.fs

@@ -61,25 +61,10 @@ let htmlToPlainTextTests =
     test "does not fail when passed an empty string" {
       Expect.equal (htmlToPlainText "") "" "Should return an empty string when given an empty string"
       }
-    ]
+    test "preserves blank lines for two consecutive line breaks" {
-
+      let expected = "Paragraph 1\n\nParagraph 2\n\n...and paragraph 3"
-[<Tests>]
+      Expect.equal (htmlToPlainText "Paragraph 1<br><br>Paragraph 2<br><br>...and <strong>paragraph</strong> <i>3</i>")
-let replaceFirstTests =
+        expected "Blank lines not preserved for consecutive line breaks"
-  testList "replaceFirst" [
-    test "replaces the first occurrence when it is found at the beginning of the string" {
-      let testString = "unit unit unit"
-      Expect.equal (replaceFirst "unit" "test" testString) "test unit unit"
-        "First occurrence of a substring was not replaced properly at the beginning of the string"
-      }
-    test "replaces the first occurrence when it is found in the center of the string" {
-      let testString = "test unit test"
-      Expect.equal (replaceFirst "unit" "test" testString) "test test test"
-        "First occurrence of a substring was not replaced properly when it is in the center of the string"
-      }
-    test "returns the original string if the replacement isn't found" {
-      let testString = "unit tests"
-      Expect.equal (replaceFirst "tested" "testing" testString) "unit tests"
-        "String which did not have the target substring was not returned properly"
       }
     ]
 
@@ -91,6 +76,46 @@ let sndAsStringTests =
       }
     ]
 
+module StringTests =
+  
+  open PrayerTracker.Utils.String
+
+  [<Tests>]
+  let replaceFirstTests =
+    testList "String.replaceFirst" [
+      test "replaces the first occurrence when it is found at the beginning of the string" {
+        let testString = "unit unit unit"
+        Expect.equal (replaceFirst "unit" "test" testString) "test unit unit"
+          "First occurrence of a substring was not replaced properly at the beginning of the string"
+        }
+      test "replaces the first occurrence when it is found in the center of the string" {
+        let testString = "test unit test"
+        Expect.equal (replaceFirst "unit" "test" testString) "test test test"
+          "First occurrence of a substring was not replaced properly when it is in the center of the string"
+        }
+      test "returns the original string if the replacement isn't found" {
+        let testString = "unit tests"
+        Expect.equal (replaceFirst "tested" "testing" testString) "unit tests"
+          "String which did not have the target substring was not returned properly"
+        }
+      ]
+   
+  [<Tests>]
+  let replaceTests =
+    testList "String.replace" [
+      test "succeeds" {
+        Expect.equal (replace "a" "b" "abacab") "bbbcbb" "String did not replace properly"
+        }
+      ]
+
+  [<Tests>]
+  let trimTests =
+    testList "String.trim" [
+      test "succeeds" {
+        Expect.equal (trim " abc ") "abc" "Space not trimmed from string properly"
+        }
+      ]
+
 [<Tests>]
 let stripTagsTests =
   let testString = "<p class=\"testing\">Here is some text<br> <br />and some more</p>"
@@ -127,3 +152,27 @@ let wordWrapTests =
       Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved"
       }
     ]
+
+[<Tests>]
+let wordWrapBTests =
+  testList "wordWrapB" [
+    test "breaks where it is supposed to" {
+      let testString = "The quick brown fox jumps over the lazy dog\nIt does!"
+      Expect.equal (wordWrap 20 testString) "The quick brown fox\njumps over the lazy\ndog\nIt does!\n"
+        "Line not broken correctly"
+      }
+    test "wraps long line without a space and a line with exact length" {
+      let testString = "Asamatteroffact, the dog does too"
+      Expect.equal (wordWrap 10 testString) "Asamattero\nffact, the\ndog does\ntoo\n"
+        "Longer line not broken correctly"
+      }
+    test "wraps long line without a space and a line with non-exact length" {
+      let testString = "Asamatteroffact, that dog does too"
+      Expect.equal (wordWrap 10 testString) "Asamattero\nffact,\nthat dog\ndoes too\n"
+        "Longer line not broken correctly"
+      }
+    test "preserves blank lines" {
+      let testString = "Here is\n\na string with blank lines"
+      Expect.equal (wordWrap 80 testString) testString "Blank lines were not preserved"
+      }
+    ]

src/PrayerTracker.Tests/UI/ViewModelsTests.fs

@@ -100,7 +100,7 @@ let appViewInfoTests =
       let vi = AppViewInfo.fresh
       Expect.isEmpty vi.style "There should have been no styles set"
       Expect.isEmpty vi.script "There should have been no scripts set"
-      Expect.equal vi.helpLink.Url HelpPage.None.Url "The help link should have been set to none"
+      Expect.isNone vi.helpLink "The help link should have been set to none"
       Expect.isEmpty vi.messages "There should have been no messages set"
       Expect.equal vi.version "" "The version should have been blank"
       Expect.isGreaterThan vi.requestStart DateTime.MinValue.Ticks "The request start time should have been set"

src/PrayerTracker.UI/Church.fs

@@ -3,8 +3,6 @@
 open Giraffe.GiraffeViewEngine
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
-open System
-open System.Collections.Generic
 
 /// View for the church edit page
 let edit (m : EditChurch) ctx vi =
@@ -14,18 +12,18 @@ let edit (m : EditChurch) ctx vi =
       style [ _scoped ]
         [ rawText "#name { width: 20rem; } #city { width: 10rem; } #st { width: 3rem; } #interfaceAddress { width: 30rem; }" ]
       csrfToken ctx
-      input [ _type "hidden"; _name "churchId"; _value (m.churchId.ToString "N") ]
+      input [ _type "hidden"; _name "churchId"; _value (flatGuid m.churchId) ]
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [ _for "name" ] [ encLocText s.["Church Name"] ]
+          label [ _for "name" ] [ locStr s.["Church Name"] ]
           input [ _type "text"; _name "name"; _id "name"; _required; _autofocus; _value m.name ]
           ]
         div [ _class "pt-field" ] [
-          label [ _for "City"] [ encLocText s.["City"] ]
+          label [ _for "City"] [ locStr s.["City"] ]
           input [ _type "text"; _name "city"; _id "city"; _required; _value m.city ]
           ]
         div [ _class "pt-field" ] [
-          label [ _for "ST" ] [ encLocText s.["State"] ]
+          label [ _for "ST" ] [ locStr s.["State"] ]
           input [ _type "text"; _name "st"; _id "st"; _required; _minlength "2"; _maxlength "2"; _value m.st ]
           ]
         ]
@@ -36,12 +34,12 @@ let edit (m : EditChurch) ctx vi =
                   yield _id "hasInterface"
                   yield _value "True"
                   match m.hasInterface with Some x when x -> yield _checked | _ -> () ]
-          label [ _for "hasInterface" ] [ encLocText s.["Has an interface with Virtual Prayer Room"] ]
+          label [ _for "hasInterface" ] [ locStr s.["Has an interface with Virtual Prayer Room"] ]
           ]
         ]
       div [ _class "pt-field-row pt-fadeable"; _id "divInterfaceAddress" ] [
         div [ _class "pt-field" ] [
-          label [ _for "interfaceAddress" ] [ encLocText s.["VPR Interface URL"] ]
+          label [ _for "interfaceAddress" ] [ locStr s.["VPR Interface URL"] ]
           input [ _type "url"; _name "interfaceAddress"; _id "interfaceAddress";
                   _value (match m.interfaceAddress with Some ia -> ia | None -> "") ]
           ]
@@ -56,50 +54,55 @@ let edit (m : EditChurch) ctx vi =
 
 /// View for church maintenance page
 let maintain (churches : Church list) (stats : Map<string, ChurchStats>) ctx vi =
-  let s = I18N.localizer.Force ()
+  let s     = I18N.localizer.Force ()
+  let chTbl =
+    match churches with
+    | [] -> space
+    | _ ->
+        table [ _class "pt-table pt-action-table" ] [
+          thead [] [
+            tr [] [
+              th [] [ locStr s.["Actions"] ]
+              th [] [ locStr s.["Name"] ]
+              th [] [ locStr s.["Location"] ]
+              th [] [ locStr s.["Groups"] ]
+              th [] [ locStr s.["Requests"] ]
+              th [] [ locStr s.["Users"] ]
+              th [] [ locStr s.["Interface?"] ]
+              ]
+            ]
+          churches
+          |> List.map (fun ch ->
+              let chId      = flatGuid ch.churchId
+              let delAction = sprintf "/church/%s/delete" chId
+              let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
+                                  sprintf "%s (%s)" (s.["Church"].Value.ToLower ()) ch.name]
+              tr [] [
+                td [] [
+                  a [ _href (sprintf "/church/%s/edit" chId); _title s.["Edit This Church"].Value ] [ icon "edit" ]
+                  a [ _href delAction
+                      _title s.["Delete This Church"].Value
+                      _onclick (sprintf "return PT.confirmDelete('%s','%A')" delAction delPrompt) ]
+                    [ icon "delete_forever" ]
+                  ]
+                td [] [ str ch.name ]
+                td [] [ str ch.city; rawText ", "; str ch.st ]
+                td [ _class "pt-right-text" ] [ rawText (stats.[chId].smallGroups.ToString "N0") ]
+                td [ _class "pt-right-text" ] [ rawText (stats.[chId].prayerRequests.ToString "N0") ]
+                td [ _class "pt-right-text" ] [ rawText (stats.[chId].users.ToString "N0") ]
+                td [ _class "pt-center-text" ] [ locStr s.[match ch.hasInterface with true -> "Yes" | false -> "No"] ]
+                ])
+          |> tbody []
+          ]
   [ div [ _class "pt-center-text" ] [
       br []
       a [ _href (sprintf "/church/%s/edit" emptyGuid); _title s.["Add a New Church"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New Church"] ]
+        [ icon "add_circle"; rawText " &nbsp;"; locStr s.["Add a New Church"] ]
       br []
       br []
       ]
     tableSummary churches.Length s
-    table [ _class "pt-table pt-action-table" ] [
+    chTbl
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["Location"] ]
-          th [] [ encLocText s.["Groups"] ]
-          th [] [ encLocText s.["Requests"] ]
-          th [] [ encLocText s.["Users"] ]
-          th [] [ encLocText s.["Interface?"] ]
-          ]
-        ]
-      churches
-      |> List.map (fun ch ->
-          let chId = ch.churchId.ToString "N"
-          let delAction = sprintf "/church/%s/delete" chId
-          let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
-                              sprintf "%s (%s)" (s.["Church"].Value.ToLower ()) ch.name]
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/church/%s/edit" chId); _title s.["Edit This Church"].Value ] [ icon "edit" ]
-              a [ _href delAction
-                  _title s.["Delete This Church"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%A')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText ch.name ]
-            td [] [ encodedText ch.city; rawText ", "; encodedText ch.st ]
-            td [ _class "pt-right-text" ] [ rawText (stats.[chId].smallGroups.ToString "N0") ]
-            td [ _class "pt-right-text" ] [ rawText (stats.[chId].prayerRequests.ToString "N0") ]
-            td [ _class "pt-right-text" ] [ rawText (stats.[chId].users.ToString "N0") ]
-            td [ _class "pt-center-text" ] [ encLocText s.[match ch.hasInterface with true -> "Yes" | false -> "No"] ]
-            ])
-      |> tbody []
-      ]
     form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
     ]
   |> Layout.Content.wide

src/PrayerTracker.UI/CommonFunctions.fs

@@ -7,11 +7,12 @@ open Microsoft.AspNetCore.Antiforgery
 open Microsoft.AspNetCore.Http
 open Microsoft.AspNetCore.Mvc.Localization
 open Microsoft.Extensions.Localization
+open System
 open System.IO
 open System.Text.Encodings.Web
 
 /// Encoded text for a localized string
-let encLocText (text : LocalizedString) = encodedText text.Value
+let locStr (text : LocalizedString) = str text.Value
 
 /// Raw text for a localized HTML string
 let rawLocText (writer : StringWriter) (text : LocalizedHtmlString) =
@@ -43,7 +44,7 @@ let tableSummary itemCount (s : IStringLocalizer) =
       | 0 -> s.["No Entries to Display"]
       | 1 -> s.["Displaying {0} Entry", itemCount]
       | _ -> s.["Displaying {0} Entries", itemCount]
-      |> encLocText
+      |> locStr
       ]
     ]
      
@@ -99,10 +100,13 @@ let selectList name selected attrs items =
 let selectDefault text = sprintf "— %s —" text
 
 /// Generate a standard submit button with icon and text
-let submit attrs ico text = button (_type "submit" :: attrs) [ icon ico; rawText "  "; encLocText text ]
+let submit attrs ico text = button (_type "submit" :: attrs) [ icon ico; rawText "  "; locStr text ]
+
+/// Format a GUID with no dashes (used for URLs and forms)
+let flatGuid (x : Guid) = x.ToString "N"
 
 /// An empty GUID string (used for "add" actions)
-let emptyGuid = System.Guid.Empty.ToString "N"
+let emptyGuid = flatGuid Guid.Empty
 
 
 /// blockquote tag

src/PrayerTracker.UI/Help.fs

@@ -1,472 +0,0 @@
-module PrayerTracker.Views.Help
-
-open Giraffe.GiraffeViewEngine
-open Microsoft.AspNetCore.Html
-open PrayerTracker
-open System.IO
-
-
-/// View for the add/edit request help page
-let editRequest () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Requests/Edit"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page allows you to enter or update a new prayer request."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request Type"] ]
-      br []
-      raw l.["There are 5 request types in {0}.", s.["PrayerTracker"]]
-      space
-      raw l.["“{0}” are your regular requests that people may have regarding things happening over the next week or so.",
-              s.["Current Requests"]]
-      space
-      raw l.["“{0}” are requests that may occur repeatedly or continue indefinitely.", s.["Long-Term Requests"]]
-      space
-      raw l.["“{0}” are like “{1}”, but they are answers to prayer to share with your group.",
-              s.["Praise Reports"], s.["Current Requests"]]
-      space
-      raw l.["“{0}” is for those who are pregnant.", s.["Expecting"]]
-      space
-      raw l.["“{0}” are like “{1}”, but instead of a request, they are simply passing information along about something coming up.",
-              s.["Announcements"], s.["Current Requests"]]
-      ]
-    p [] [
-      raw l.["The order above is the order in which the request types appear on the list."]
-      space
-      raw l.["“{0}” and “{1}” are not subject to the automatic expiration (set on the “{2}” page) that the other requests are.",
-              s.["Long-Term Requests"], s.["Expecting"], s.["Change Preferences"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Date"] ]
-      br []
-      raw l.["For new requests, this is a box with a calendar date picker."]
-      space
-      raw l.["Click or tab into the box to display the calendar, which will be preselected to today's date."]
-      space
-      raw l.["For existing requests, there will be a check box labeled “{0}”.", s.["Check to not update the date"]]
-      space
-      raw l.["This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Requestor / Subject"] ]
-      br []
-      raw l.["For requests or praises, this field is for the name of the person who made the request or offered the praise report."]
-      space
-      raw l.["For announcements, this should contain the subject of the announcement."]
-      space
-      raw l.["For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Expiration"] ]
-      br []
-      raw l.["“{0}” means that the request is subject to the expiration days in the group preferences.",
-              s.["Expire Normally"]]
-      space
-      raw l.["“{0}” can be used to make a request never expire (note that this is redundant for “{1}” and “{2}”).",
-              s.["Request Never Expires"], s.["Long-Term Requests"], s.["Expecting"]]
-      space
-      raw l.["If you are editing an existing request, a third option appears."]
-      space
-      raw l.["“{0}” will make the request expire when it is saved.", s.["Expire Immediately"]]
-      space
-      raw l.["Apart from the icons on the request maintenance page, this is the only way to expire “{0}” and “{1}” requests, but it can be used for any request type.",
-              s.["Long-Term Requests"], s.["Expecting"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request"] ]
-      br []
-      raw l.["This is the text of the request."]
-      space
-      raw l.["The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself."]
-      space
-      raw l.["It also supports undo and redo, and the editor supports full-screen mode."]
-      space
-      raw l.["Hover over each icon to see what each button does."]
-      ]
-    ]
-  |> Layout.help "Add / Edit a Request"
-
-
-/// View for the small group member maintenance help
-let groupMembers () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Group/Members"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["From this page, you can add, edit, and delete the e-mail addresses for your group."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Add a New Group Member"] ]
-      br []
-      raw l.["To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Edit Group Member"] ]
-      br []
-      raw l.["To edit an e-mail address, click the blue pencil icon; it's the first icon under the “{0}” column heading.",
-              s.["Actions"]]
-      space
-      raw l.["This will allow you to update the name and/or the e-mail address for that member."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Delete a Group Member"] ]
-      br []
-      raw l.["To delete an e-mail address, click the blue trash can icon in the “{0}” column.", s.["Actions"]]
-      space
-      raw l.["Note that once an e-mail address has been deleted, it is gone."]
-      space
-      raw l.["(Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)"]
-      ]
-    ]
-  |> Layout.help "Maintain Group Members"
-
-
-/// View for the log on help page
-let logOn () =
-  let s = I18N.localizer.Force ()
-  let l = I18N.forView "Help/User/LogOn"
-  use sw = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page allows you to log on to {0}.", s.["PrayerTracker"]]
-      space
-      raw l.["There are two different levels of access for {0} - user and group.", s.["PrayerTracker"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["User Log On"] ]
-      br []
-      raw l.["Select your group, then enter your e-mail address and password into the appropriate boxes."]
-      space
-      raw l.["If you want {0} to remember you on your computer, click the “{1}” box before clicking the “{2}” button.",
-              s.["PrayerTracker"], s.["Remember Me"], s.["Log On"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Group Log On"] ]
-      br []
-      raw l.["If your group has defined a password to use to allow you to view their request list online, select your group from the drop down list, then enter the group password into the appropriate box."]
-      space
-      raw l.["If you want {0} to remember your group, click the “{1}” box before clicking the “{2}” button.",
-              s.["PrayerTracker"], s.["Remember Me"], s.["Log On"]]
-      ]
-    ]
-  |> Layout.help "Log On"
-
-/// Help index page
-let index vi =
-  let s = I18N.localizer.Force ()
-  let l = I18N.forView "Help/Index"
-  use sw = new StringWriter ()
-  let raw = rawLocText sw
-
-  let helpRows =
-    Help.all
-    |> List.map (fun h ->
-        tr [] [
-          td [] [
-            a [ _href (sprintf "/help/%s" h.Url)
-                _onclick (sprintf "return PT.showHelp('%s')" h.Url) ]
-              [ encLocText s.[h.linkedText] ]
-            ]
-          ])
-    
-  [ p [] [
-      raw l.["Throughout {0}, you'll see this icon {1} next to the title on each page.",
-              s.["PrayerTracker"], icon "help_outline" |> (renderHtmlNode >> HtmlString)]
-      space
-      raw l.["Clicking this will open a new, small window with directions on using that page."]
-      space
-      raw l.["If you are looking for a quick overview of {0}, start with the “{1}” and “{2}” entries.",
-              s.["PrayerTracker"], s.["Edit Request"], s.["Change Preferences"]]
-      ]
-    hr []
-    p [ _class "pt-center-text" ] [ strong [] [ encLocText s.["Help Topics"] ] ]
-    table [ _class "pt-table" ] [ tbody [] helpRows ]
-    ]
-  |> Layout.Content.standard
-  |> Layout.standard vi "Help"
-
-
-let password () =
-  let s = I18N.localizer.Force ()
-  let l = I18N.forView "Help/User/Password"
-  use sw = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page will let you change your password."]
-      space
-      raw l.["Enter your existing password in the top box, then enter your new password in the bottom two boxes."]
-      space
-      raw l.["Entering your existing password is a security measure; with the “{0}” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password.",
-              s.["Remember Me"]]
-      ]
-    p [] [
-      raw l.["If you cannot remember your existing password, we cannot retrieve it, but we can set it to something known so that you can then change it to your password."]
-      space
-      raw l.["<a href=\"mailto:daniel@djs-consulting.com?subject={0}%20Password%20Help\">Click here to request help resetting your password</a>.",
-              s.["PrayerTracker"]]
-      ]
-    ]
-  |> Layout.help "Change Your Password"
-
-
-/// View for the small group preferences help page
-let preferences () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Group/Preferences"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["This page allows you to change how your prayer request list looks and behaves."]
-      space
-      raw l.["Each section is addressed below."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Requests Expire After"] ]
-      br []
-      raw l.["When a regular request goes this many days without being updated, it expires and no longer appears on the request list."]
-      space
-      raw l.["Note that the categories “{0}” and “{1}” never expire automatically.", s.["Long-Term Requests"], s.["Expecting"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Requests “New” For"] ]
-      br []
-      raw l.["Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests."]
-      space
-      raw l.["All categories respect this setting."]
-      space
-      raw l.["If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet."]
-      space
-      raw l.["(NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)"]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Long-Term Requests Alerted for Update"] ]
-      br []
-      raw l.["Requests that have not been updated in this many weeks are identified by an italic font on the “{0}” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current.",
-              s.["Maintain Requests"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request Sorting"] ]
-      br []
-      raw l.["By default, requests are sorted within each group by the last updated date, with the most recent on top."]
-      space
-      raw l.["If you would prefer to have the list sorted by requestor or subject rather than by date, select “{0}” instead.",
-              s.["Sort by Requestor Name"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["E-mail “From” Name and Address"] ]
-      br []
-      raw l.["{0} must put an name and e-mail address in the “from” position of each e-mail it sends.", s.["PrayerTracker"]]
-      space
-      raw l.["The default name is “PrayerTracker”, and the default e-mail address is “prayer@djs-consulting.com”."]
-      space
-      raw l.["This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address)."]
-      space
-      raw l.["Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["E-mail Format"] ]
-      br []
-      raw l.["This is the default e-mail format for your group."]
-      space
-      raw l.["The {0} default is HTML, which sends the list just as you see it online.", s.["PrayerTracker"]]
-      space
-      raw l.["However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting."]
-      space
-      raw l.["The setting on this page is the group default; you can select a format for each recipient on the “{0}” page.",
-              s.["Maintain Group Members"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Colors"] ]
-      br []
-      raw l.["You can customize the colors that are used for the headings and lines in your request list."]
-      space
-      raw l.["You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255."]
-      space
-      raw l.["There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic."]
-      space
-      raw l.["The background color cannot be changed."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Fonts{0} for List", ""] ]
-      br []
-      raw l.["This is a comma-separated list of fonts that will be used for your request list."]
-      space
-      raw l.["A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font."]
-      space
-      raw l.["It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”."]
-      space
-      raw l.["You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Heading / List Text Size"] ]
-      br []
-      raw l.["This is the point size to use for each."]
-      space
-      raw l.["The default for the heading is 16pt, and the default for the text is 12pt."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Making a “Large Print” List"] ]
-      br []
-      raw l.["If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:"]
-      br []
-      blockquote [] [
-        em [] [ encLocText s.["Fonts"] ]
-        rawText " &#8212; 'Times New Roman',serif"
-        br []
-        em [] [ encLocText s.["Heading Text Size"] ]
-        rawText " &#8212; 18pt"
-        br []
-        em [] [ encLocText s.["List Text Size"] ]
-        rawText " &#8212; 16pt"
-        ]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Time Zone"] ]
-      br []
-      raw l.["This is the time zone that you would like to use for your group."]
-      space
-      raw l.["If you do not see your time zone listed, just <a href=\"mailto:daniel@djs-consulting.com?subject={0}%20{1}\">contact Daniel</a> and tell him what time zone you need.",
-              s.["PrayerTracker"], s.["Time Zone"].Value.Replace(" ", "%20")]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Request List Visibility"] ]
-      br []
-      raw l.["The group's request list can be either public, private, or password-protected."]
-      space
-      raw l.["Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator)."]
-      space
-      raw l.["Password-protected lists allow group members to log in and view the current request list online, using the “{0}” link and providing this password.",
-              s.["Group Log On"]]
-      raw l.["As this is a shared password, it is stored in plain text, so you can easily see what it is."]
-      space
-      raw l.["If you select “{0}” but do not enter a password, the list remains private, which is also the default value.",
-              s.["Password Protected"]]
-      space
-      raw l.["(Changing this password will force all members of the group who logged in with the “{0}” box checked to provide the new password.)",
-        s.["Remember Me"]]
-      ]
-    ]
-  |> Layout.help "Change Preferences"
-
-
-/// View for the request maintenance help page
-let requests () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Requests/Maintain"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["From this page, you can add, edit, and delete your current requests."]
-      raw l.["You can also restore requests that may have expired, but should be made active once again."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Add a New Request"] ]
-      br []
-      raw l.["To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Edit Request"] ]
-      br []
-      raw l.["To edit a request, click the blue pencil icon; it's the first icon under the “{0}” column heading.",
-              s.["Actions"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Expire a Request"] ]
-      br []
-      raw l.["For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately."]
-      space
-      raw l.["This is equivalent to editing the request, selecting “{0}”, and saving it.", s.["Expire Immediately"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Restore an Inactive Request"] ]
-      br []
-      raw l.["When the page is first displayed, it does not display inactive requests."]
-      space
-      raw l.["However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown."]
-      space
-      raw l.["The middle icon will look like an eye; clicking it will restore the request as an active request."]
-      space
-      raw l.["The last updated date will be current, and the request is set to expire normally."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Delete a Request"] ]
-      br []
-      raw l.["Deleting a request is contrary to the intent of {0}, as you can retrieve requests that have expired.",
-              s.["PrayerTracker"]]
-      space
-      raw l.["However, if there is a request that needs to be deleted, clicking the blue trash can icon in the “{0}” column will allow you to do it.",
-              s.["Actions"]]
-      space
-      raw l.["Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good."]
-      ]
-    ]
-  |> Layout.help "Maintain Requests"
-
-/// View for the Send Announcement page help
-let sendAnnouncement () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Group/Announcement"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      strong [] [ encLocText s.["Announcement Text"] ]
-      br []
-      raw l.["This is the text of the announcement you would like to send."]
-      space
-      raw l.["It functions the same way as the text box on the “<a href=\"{0}\">{1}</a>” page.",
-              (sprintf "/help/%s/%s" Help.editRequest.``module`` Help.editRequest.topic), s.["Edit Request"]]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Add to Request List"] ]
-      br []
-      raw l.["Without this box checked, the text of the announcement will only be e-mailed to your group members."]
-      space
-      raw l.["If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected."]
-      ]
-    ]
-  |> Layout.help "Send Announcement"
-
-let viewRequests () =
-  let s   = I18N.localizer.Force ()
-  let l   = I18N.forView "Help/Requests/View"
-  use sw  = new StringWriter ()
-  let raw = rawLocText sw
-  [ p [] [
-      raw l.["From this page, you can view the request list (for today or for the next Sunday), view a printable version of the list, and e-mail the list to the members of your group."]
-      space
-      raw l.["(NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)"]
-      ]
-    p [] [
-      strong [] [ encLocText s.["List for Next Sunday"] ]
-      br []
-      raw l.["This will modify the date for the list, so it will look like it is currently next Sunday."]
-      space
-      raw l.["This can be used, for example, to see what requests will expire, or allow you to print a list with Sunday's date on Saturday evening."]
-      space
-      raw l.["Note that this link does not appear if it is Sunday."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["View Printable"] ]
-      br []
-      raw l.["Clicking this link will display the list in a format that is suitable for printing; it does not have the normal {0} header across the top.",
-              s.["PrayerTracker"]]
-      space
-      raw l.["Once you have clicked the link, you can print it using your browser's standard “Print” functionality."]
-      ]
-    p [] [
-      strong [] [ encLocText s.["Send Via E-mail"] ]
-      br []
-      raw l.["Clicking this link will send the list you are currently viewing to your group members."]
-      space
-      raw l.["The page will remind you that you are about to do that, and ask for your confirmation."]
-      space
-      raw l.["If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like."]
-      space
-      raw l.["You may safely use your browser's “Back” button to navigate away from the page."]
-      ]
-    ]
-  |> Layout.help "View Request List"

src/PrayerTracker.UI/Home.fs

@@ -39,7 +39,7 @@ let error code vi =
             _alt (sprintf "%A %A" s.["PrayerTracker"] s.["from Bit Badger Solutions"])
             _title (sprintf "%A %A" s.["PrayerTracker"] s.["from Bit Badger Solutions"])
             _style "vertical-align:text-bottom;" ]
-      encodedText vi.version
+      str vi.version
       ]
     ]
   |> div []
@@ -203,17 +203,17 @@ let termsOfService vi =
   use sw     = new StringWriter ()
   let raw    = rawLocText sw
   let ppLink =
-    a [ _href "/legal/privacy-policy" ] [ encodedText (s.["Privacy Policy"].Value.ToLower ()) ]
+    a [ _href "/legal/privacy-policy" ] [ str (s.["Privacy Policy"].Value.ToLower ()) ]
     |> (renderHtmlNode >> HtmlString)
 
   [ p [ _class "pt-right-text" ] [ small [] [ em [] [ raw l.["(as of May 24, 2018)"] ] ] ]
-    h3 [] [ encodedText "1. "; raw l.["Acceptance of Terms"] ]
+    h3 [] [ str "1. "; raw l.["Acceptance of Terms"] ]
     p [] [
       raw l.["By accessing this web site, you are agreeing to be bound by these Terms and Conditions, and that you are responsible to ensure that your use of this site complies with all applicable laws."]
       space
       raw l.["Your continued use of this site implies your acceptance of these terms."]
       ]
-    h3 [] [ encodedText "2. "; raw l.["Description of Service and Registration"] ]
+    h3 [] [ str "2. "; raw l.["Description of Service and Registration"] ]
     p [] [
       raw l.["{0} is a service that allows individuals to enter and amend prayer requests on behalf of organizations.",
               s.["PrayerTracker"]]
@@ -222,13 +222,13 @@ let termsOfService vi =
       space
       raw l.["See our {0} for details on the personal (user) information we maintain.", ppLink]
       ]
-    h3 [] [ encodedText "3. "; raw l.["Liability"] ]
+    h3 [] [ str "3. "; raw l.["Liability"] ]
     p [] [
       raw l.["This service is provided “as is”, and no warranty (express or implied) exists."]
       space
       raw l.["The service and its developers may not be held liable for any damages that may arise through the use of this service."]
       ]
-    h3 [] [ encodedText "4. "; raw l.["Updates to Terms"] ]
+    h3 [] [ str "4. "; raw l.["Updates to Terms"] ]
     p [] [
       raw l.["These terms and conditions may be updated at any time."]
       space

src/PrayerTracker.UI/Layout.fs

@@ -5,12 +5,16 @@ open Giraffe.GiraffeViewEngine
 open PrayerTracker
 open PrayerTracker.ViewModels
 open System
+open System.Globalization
   
+
+/// Get the two-character language code for the current request
+let langCode () = match CultureInfo.CurrentCulture.Name.StartsWith "es" with true -> "es" | _ -> "en"
+
+
 /// Navigation items
 module Navigation =
   
-  open System.Globalization
-    
   /// Top navigation bar
   let top m =
     let s = PrayerTracker.Views.I18N.localizer.Force ()
@@ -20,30 +24,30 @@ module Navigation =
       | Some u ->
           yield li [ _class "dropdown" ] [
             a [ _class "dropbtn"; _role "button"; _aria "label" s.["Requests"].Value; _title s.["Requests"].Value ]
-              [ icon "question_answer"; space; encLocText s.["Requests"]; space; icon "keyboard_arrow_down" ]
+              [ icon "question_answer"; space; locStr s.["Requests"]; space; icon "keyboard_arrow_down" ]
             div [ _class "dropdown-content"; _role "menu" ] [
-              a [ _href "/prayer-requests" ]      [ icon "compare_arrows"; menuSpacer; encLocText s.["Maintain"] ]
+              a [ _href "/prayer-requests" ]      [ icon "compare_arrows"; menuSpacer; locStr s.["Maintain"] ]
-              a [ _href "/prayer-requests/view" ] [ icon "list";           menuSpacer; encLocText s.["View List"] ]
+              a [ _href "/prayer-requests/view" ] [ icon "list";           menuSpacer; locStr s.["View List"] ]
               ]
             ]
           yield li [ _class "dropdown" ] [
             a [ _class "dropbtn"; _role "button"; _aria "label" s.["Group"].Value; _title s.["Group"].Value ]
-              [ icon "group"; space; encLocText s.["Group"]; space; icon "keyboard_arrow_down" ]
+              [ icon "group"; space; locStr s.["Group"]; space; icon "keyboard_arrow_down" ]
             div [ _class "dropdown-content"; _role "menu" ] [
-              a [ _href "/small-group/members" ]      [ icon "email"; menuSpacer; encLocText s.["Maintain Group Members"] ]
+              a [ _href "/small-group/members" ]      [ icon "email"; menuSpacer; locStr s.["Maintain Group Members"] ]
-              a [ _href "/small-group/announcement" ] [ icon "send";  menuSpacer; encLocText s.["Send Announcement"] ]
+              a [ _href "/small-group/announcement" ] [ icon "send";  menuSpacer; locStr s.["Send Announcement"] ]
-              a [ _href "/small-group/preferences" ]  [ icon "build"; menuSpacer; encLocText s.["Change Preferences"] ]
+              a [ _href "/small-group/preferences" ]  [ icon "build"; menuSpacer; locStr s.["Change Preferences"] ]
               ]
             ]
           match u.isAdmin with
           | true ->
               yield li [ _class "dropdown" ] [
                 a [ _class "dropbtn"; _role "button"; _aria "label" s.["Administration"].Value; _title s.["Administration"].Value ]
-                  [ icon "settings"; space; encLocText s.["Administration"]; space; icon "keyboard_arrow_down" ]
+                  [ icon "settings"; space; locStr s.["Administration"]; space; icon "keyboard_arrow_down" ]
                 div [ _class "dropdown-content"; _role "menu" ] [
-                  a [ _href "/churches" ]     [ icon "home";  menuSpacer; encLocText s.["Churches"] ]
+                  a [ _href "/churches" ]     [ icon "home";  menuSpacer; locStr s.["Churches"] ]
-                  a [ _href "/small-groups" ] [ icon "send";  menuSpacer; encLocText s.["Groups"] ]
+                  a [ _href "/small-groups" ] [ icon "send";  menuSpacer; locStr s.["Groups"] ]
-                  a [ _href "/users" ]        [ icon "build"; menuSpacer; encLocText s.["Users"] ]
+                  a [ _href "/users" ]        [ icon "build"; menuSpacer; locStr s.["Users"] ]
                   ]
                 ]
           | false -> ()
@@ -54,26 +58,30 @@ module Navigation =
                 a [ _href "/prayer-requests/view"
                     _aria "label" s.["View Request List"].Value
                     _title s.["View Request List"].Value ]
-                  [ icon "list"; space; encLocText s.["View Request List"] ]
+                  [ icon "list"; space; locStr s.["View Request List"] ]
                 ]
           | None ->
               yield li [ _class "dropdown" ] [
                 a [ _class "dropbtn"; _role "button"; _aria "label" s.["Log On"].Value; _title s.["Log On"].Value ]
-                  [ icon "security"; space; encLocText s.["Log On"]; space; icon "keyboard_arrow_down" ]
+                  [ icon "security"; space; locStr s.["Log On"]; space; icon "keyboard_arrow_down" ]
                 div [ _class "dropdown-content"; _role "menu" ] [
-                  a [ _href "/user/log-on" ] [ icon "person"; menuSpacer; encLocText s.["User"] ]
+                  a [ _href "/user/log-on" ]        [ icon "person"; menuSpacer; locStr s.["User"] ]
-                  a [ _href "/small-group/log-on" ] [ icon "group"; menuSpacer; encLocText s.["Group"] ]
+                  a [ _href "/small-group/log-on" ] [ icon "group";  menuSpacer; locStr s.["Group"] ]
                   ]
                 ]
               yield li [] [
                 a [ _href "/prayer-requests/lists"
                     _aria "label" s.["View Request List"].Value
                     _title s.["View Request List"].Value ]
-                  [ icon "list"; space; encLocText s.["View Request List"] ]
+                  [ icon "list"; space; locStr s.["View Request List"] ]
                 ]
       yield li [] [
-        a [ _href "/help"; _aria "label" s.["Help"].Value; _title s.["View Help"].Value ]
+        a [ _href   (sprintf "https://docs.prayer.bitbadger.solutions/%s" <| langCode ())
-          [ icon "help"; space; encLocText s.["Help"] ]
+            _aria   "label" s.["Help"].Value;
+            _title  s.["View Help"].Value
+            _target "_blank"
+            ]
+          [ icon "help"; space; locStr s.["Help"] ]
         ]
       ]
     let rightLinks =
@@ -85,19 +93,19 @@ module Navigation =
                   a [ _href "/user/password"
                       _aria "label" s.["Change Your Password"].Value
                       _title s.["Change Your Password"].Value ]
-                    [ icon "lock"; space; encLocText s.["Change Your Password"] ]
+                    [ icon "lock"; space; locStr s.["Change Your Password"] ]
                   ]
             | None -> ()
             yield li [] [
               a [ _href "/log-off"; _aria "label" s.["Log Off"].Value; _title s.["Log Off"].Value ]
-                [ icon "power_settings_new"; space; encLocText s.["Log Off"] ]
+                [ icon "power_settings_new"; space; locStr s.["Log Off"] ]
               ]
             ]
       | None -> List.empty
     header [ _class "pt-title-bar" ] [
       section [ _class "pt-title-bar-left" ] [
         span [ _class "pt-title-bar-home" ] [
-          a [ _href "/"; _title s.["Home"].Value ] [ encLocText s.["PrayerTracker"] ]
+          a [ _href "/"; _title s.["Home"].Value ] [ locStr s.["PrayerTracker"] ]
           ]
         ul [] leftLinks
         ]
@@ -112,40 +120,41 @@ module Navigation =
     let s = I18N.localizer.Force ()
     header [ _id "pt-language" ] [
       div [] [
-        yield span [ _class "u" ] [ encLocText s.["Language"]; rawText ": " ]
+        yield span [ _class "u" ] [ locStr s.["Language"]; rawText ": " ]
-        match CultureInfo.CurrentCulture.Name.StartsWith "es" with
+        match langCode () with
-        | true -> 
+        | "es" -> 
-            yield encLocText s.["Spanish"]
+            yield locStr s.["Spanish"]
             yield rawText " &nbsp; &bull; &nbsp; "
-            yield a [ _href "/language/en" ] [ encLocText s.["Change to English"] ]
+            yield a [ _href "/language/en" ] [ locStr s.["Change to English"] ]
-        | false ->
+        | _ ->
-            yield encLocText s.["English"]
+            yield locStr s.["English"]
             yield rawText " &nbsp; &bull; &nbsp; "
-            yield a [ _href "/language/es" ] [ encLocText s.["Cambie a Español"] ]
+            yield a [ _href "/language/es" ] [ locStr s.["Cambie a Español"] ]
         ]
       match m.group with
       | Some g ->
           [ match m.user with
             | Some u ->
-                yield span [ _class "u" ] [ encLocText s.["Currently Logged On"] ]
+                yield span [ _class "u" ] [ locStr s.["Currently Logged On"] ]
                 yield rawText "&nbsp; &nbsp;"
                 yield icon "person"
-                yield strong [] [ encodedText u.fullName ]
+                yield strong [] [ str u.fullName ]
                 yield rawText "&nbsp; &nbsp; "
             | None ->
-                yield encLocText s.["Logged On as a Member of"]
+                yield locStr s.["Logged On as a Member of"]
                 yield rawText "&nbsp; "
             yield icon "group"
             yield space
             match m.user with
-            | Some _ -> yield  a [ _href "/small-group" ] [ strong [] [ encodedText g.name ] ]
+            | Some _ -> yield  a [ _href "/small-group" ] [ strong [] [ str g.name ] ]
-            | None -> yield strong [] [ encodedText g.name ]
+            | None -> yield strong [] [ str g.name ]
             yield rawText " &nbsp;"
             ]
       | None -> []
       |> div []
       ]
 
+
 /// Content layouts
 module Content =
   /// Content layout that tops at 60rem
@@ -171,7 +180,7 @@ let private htmlHead m pageTitle =
   let s = I18N.localizer.Force ()
   head [] [
     yield meta [ _charset "UTF-8" ]
-    yield title [] [ encLocText pageTitle; titleSep; encLocText s.["PrayerTracker"] ]
+    yield title [] [ locStr pageTitle; titleSep; locStr s.["PrayerTracker"] ]
     yield! commonHead
     for cssFile in m.style do
       yield link [ _rel "stylesheet"; _href (sprintf "/css/%s.css" cssFile); _type "text/css" ]
@@ -183,7 +192,7 @@ let private htmlHead m pageTitle =
 let private helpLink link =
   let s = I18N.localizer.Force ()
   sup [] [
-    a [ _href (sprintf "/help/%s" link)
+    a [ _href link
         _title s.["Click for Help on This Page"].Value
         _onclick (sprintf "return PT.showHelp('%s')" link) ] [
       icon "help_outline"
@@ -194,9 +203,9 @@ let private helpLink link =
 let private renderPageTitle m pageTitle =
   h2 [ _id "pt-page-title" ] [
     match m.helpLink with
-    | x when x = HelpPage.None -> ()
+    | Some link -> yield  Help.fullLink (langCode ()) link |> helpLink
-    | _ -> yield helpLink m.helpLink.Url
+    | None -> ()
-    yield encLocText pageTitle
+    yield locStr pageTitle
     ]
 
 /// Render the messages that may need to be displayed to the user
@@ -210,7 +219,7 @@ let private messages m =
             match msg.level with
             | "Info" -> ()
             | lvl ->
-                yield strong [] [ encLocText s.[lvl] ]
+                yield strong [] [ locStr s.[lvl] ]
                 yield rawText " &#xbb; "
             yield rawText msg.text.Value
             match msg.description with
@@ -229,25 +238,25 @@ let private htmlFooter m =
   let resultTime = TimeSpan(DateTime.Now.Ticks - m.requestStart).TotalSeconds
   footer [] [
     div [ _id "pt-legal" ] [
-      a [ _href "/legal/privacy-policy" ] [ encLocText s.["Privacy Policy"] ]
+      a [ _href "/legal/privacy-policy" ] [ locStr s.["Privacy Policy"] ]
       rawText " &bull; "
-      a [ _href "/legal/terms-of-service" ] [ encLocText s.["Terms of Service"] ]
+      a [ _href "/legal/terms-of-service" ] [ locStr s.["Terms of Service"] ]
       rawText " &bull; "
       a [ _href "https://github.com/bit-badger/PrayerTracker"
           _title s.["View source code and get technical support"].Value
           _target "_blank"
           _rel "noopener" ] [
-        encLocText s.["Source & Support"]
+        locStr s.["Source & Support"]
         ]
       ]
     div [ _id "pt-footer" ] [
       a [ _href "/"; _style "line-height:28px;" ] [
         img [ _src (sprintf "/img/%O.png" s.["footer_en"]); _alt imgText; _title imgText ]
         ]
-      encodedText m.version
+      str m.version
       space
       i [ _title s.["This page loaded in {0:N3} seconds", resultTime].Value; _class "material-icons md-18" ] [
-        encodedText "schedule"
+        str "schedule"
         ]
       ]
     ]
@@ -277,39 +286,9 @@ let bare pageTitle content =
   html [ _lang "" ] [
     head [] [
       meta [ _charset "UTF-8" ]
-      title [] [ encLocText ttl; titleSep; encLocText s.["PrayerTracker"] ]
+      title [] [ locStr ttl; titleSep; locStr s.["PrayerTracker"] ]
       ]
     body [] [
       content
       ]
     ]
-
-/// Help layout
-let help pageTitle content =
-  let s   = I18N.localizer.Force ()
-  let ttl = s.[pageTitle]
-  html [ _lang "" ] [
-    head [] [
-      yield meta [ _charset "UTF-8" ]
-      yield title [] [ encLocText ttl; titleSep; encLocText s.["Help"]; titleSep; encLocText s.["PrayerTracker"] ]
-      yield! commonHead
-      yield link [ _rel "stylesheet"; _href "/css/help.css" ]
-      ]
-    body [] [
-      header [ _class "pt-title-bar" ] [
-        section [ _class "pt-title-bar-left" ] [ encLocText s.["PrayerTracker"] ]
-        section [ _class "pt-title-bar-right" ] [ encLocText s.["Help"] ]
-        ]
-      div [ _class "pt-content" ] [
-        yield h2 [] [ encLocText ttl ]
-        yield! content
-        yield p [ _class "pt-center-text" ] [
-          a [ _href "#"
-              _title s.["Click to Close This Window"].Value
-              _onclick "window.close();return false" ] [
-            tag "big" [] [ icon "cancel"; space; encLocText s.["Close Window"] ]
-            ]
-          ]
-        ]
-      ]
-    ]

src/PrayerTracker.UI/PrayerRequest.fs

@@ -17,17 +17,17 @@ let edit (m : EditRequest) today ctx vi =
   let pageTitle = match m.isNew () with true -> "Add a New Request" | false -> "Edit Request"
   [ form [ _action "/prayer-request/save"; _method "post"; _class "pt-center-columns" ] [
       csrfToken ctx
-      input [ _type "hidden"; _name "requestId"; _value (m.requestId.ToString "N") ]
+      input [ _type "hidden"; _name "requestId"; _value (flatGuid m.requestId) ]
       div [ _class "pt-field-row" ] [
         yield div [ _class "pt-field" ] [
-          label [ _for "requestType" ] [ encLocText s.["Request Type"] ]
+          label [ _for "requestType" ] [ locStr s.["Request Type"] ]
           ReferenceList.requestTypeList s
           |> Seq.ofList
           |> Seq.map (fun item -> fst item, (snd item).Value)
           |> selectList "requestType" m.requestType [ _required; _autofocus ]
           ]
         yield div [ _class "pt-field" ] [
-          label [ _for "requestor" ] [ encLocText s.["Requestor / Subject"] ]
+          label [ _for "requestor" ] [ locStr s.["Requestor / Subject"] ]
           input [ _type "text"
                   _name "requestor"
                   _id "requestor"
@@ -36,7 +36,7 @@ let edit (m : EditRequest) today ctx vi =
         match m.isNew () with
         | true ->
             yield div [ _class "pt-field" ] [
-              label [ _for "enteredDate" ] [ encLocText s.["Date"] ]
+              label [ _for "enteredDate" ] [ locStr s.["Date"] ]
               input [ _type "date"; _name "enteredDate"; _id "enteredDate"; _placeholder today ]
               ]
         | false ->
@@ -44,21 +44,21 @@ let edit (m : EditRequest) today ctx vi =
               div [ _class "pt-checkbox-field" ] [
                 br []
                 input [ _type "checkbox"; _name "skipDateUpdate"; _id "skipDateUpdate"; _value "True" ]
-                label [ _for "skipDateUpdate" ] [ encLocText s.["Check to not update the date"] ]
+                label [ _for "skipDateUpdate" ] [ locStr s.["Check to not update the date"] ]
                 br []
-                small [] [ em [] [ encodedText (s.["Typo Corrections"].Value.ToLower ()); rawText ", etc." ] ]
+                small [] [ em [] [ str (s.["Typo Corrections"].Value.ToLower ()); rawText ", etc." ] ]
                 ]
               ]
         ]
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [] [ encLocText s.["Expiration"] ]
+          label [] [ locStr s.["Expiration"] ]
           ReferenceList.expirationList s ((m.isNew >> not) ())
           |> List.map (fun exp ->
               let radioId = sprintf "expiration_%s" (fst exp)
               span [ _class "text-nowrap" ] [
                 radio "expiration" radioId (fst exp) m.expiration
-                label [ _for radioId ] [ encLocText (snd exp) ]
+                label [ _for radioId ] [ locStr (snd exp) ]
                 rawText "     "
                 ])
           |> div [ _class "pt-center-text" ]
@@ -66,8 +66,8 @@ let edit (m : EditRequest) today ctx vi =
         ]
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field pt-editor" ] [
-          label [ _for "text" ] [ encLocText s.["Request"] ]
+          label [ _for "text" ] [ locStr s.["Request"] ]
-          textarea [ _name "text"; _id "text" ] [ encodedText m.text ]
+          textarea [ _name "text"; _id "text" ] [ str m.text ]
           ]
         ]
       div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Request"] ]
@@ -87,17 +87,17 @@ let email m vi =
     |> List.fold (fun (acc : StringBuilder) mbr -> acc.AppendFormat(", {0} <{1}>", mbr.memberName, mbr.email))
                  (StringBuilder ())
   [ p [ _style (sprintf "font-family:%s;font-size:%ipt;" prefs.listFonts prefs.textFontSize) ] [
-      encLocText s.["The request list was sent to the following people, via individual e-mails"]
+      locStr s.["The request list was sent to the following people, via individual e-mails"]
       rawText ":"
       br []
-      small [] [ encodedText (addresses.Remove(0, 2).ToString ()) ]
+      small [] [ str (addresses.Remove(0, 2).ToString ()) ]
       ]
-    span [ _class "pt-email-heading" ] [ encLocText s.["HTML Format"]; rawText ":" ]
+    span [ _class "pt-email-heading" ] [ locStr s.["HTML Format"]; rawText ":" ]
     div [ _class "pt-email-canvas" ] [ rawText (m.asHtml s) ]
     br []
     br []
-    span [ _class "pt-email-heading" ] [ encLocText s.["Plain-Text Format"]; rawText ":" ]
+    span [ _class "pt-email-heading" ] [ locStr s.["Plain-Text Format"]; rawText ":" ]
-    div[ _class "pt-email-canvas" ] [ pre [] [ encodedText (m.asText s) ] ]
+    div[ _class "pt-email-canvas" ] [ pre [] [ str (m.asText s) ] ]
     ]
   |> Layout.Content.standard
   |> Layout.standard vi pageTitle
@@ -132,14 +132,14 @@ let lists (grps : SmallGroup list) vi =
         yield table [ _class "pt-table pt-action-table" ] [
           thead [] [
             tr [] [
-              th [] [ encLocText s.["Actions"] ]
+              th [] [ locStr s.["Actions"] ]
-              th [] [ encLocText s.["Church"] ]
+              th [] [ locStr s.["Church"] ]
-              th [] [ encLocText s.["Group"] ]
+              th [] [ locStr s.["Group"] ]
               ]
             ]
           grps
           |> List.map (fun grp ->
-              let grpId = grp.smallGroupId.ToString "N"
+              let grpId = flatGuid grp.smallGroupId
               tr [] [
                 match grp.preferences.isPublic with
                 | true ->
@@ -149,8 +149,8 @@ let lists (grps : SmallGroup list) vi =
                       [ icon "verified_user" ]
                 |> List.singleton
                 |> td []
-                td [] [ encodedText grp.church.name ]
+                td [] [ str grp.church.name ]
-                td [] [ encodedText grp.name ]
+                td [] [ str grp.name ]
                 ])
           |> tbody []
           ]
@@ -175,7 +175,7 @@ let maintain (reqs : PrayerRequest seq) (grp : SmallGroup) onlyActive (ctx : Htt
   let requests =
     reqs
     |> Seq.map (fun req ->
-        let reqId     = req.prayerRequestId.ToString "N"
+        let reqId     = flatGuid req.prayerRequestId
         let reqText   = Utils.htmlToPlainText req.text
         let delAction = sprintf "/prayer-request/%s/delete" reqId
         let delPrompt = s.["Are you want to delete this prayer request?  This action cannot be undone.\\n(If the prayer request has been answered, or an event has passed, consider inactivating it instead.)"].Value
@@ -197,11 +197,10 @@ let maintain (reqs : PrayerRequest seq) (grp : SmallGroup) onlyActive (ctx : Htt
               [ icon "delete_forever" ]
             ]
           td [ updReq req ] [
-            encodedText (req.updatedDate.ToString(s.["MMMM d, yyyy"].Value,
+            str (req.updatedDate.ToString(s.["MMMM d, yyyy"].Value, System.Globalization.CultureInfo.CurrentUICulture))
-                            System.Globalization.CultureInfo.CurrentUICulture))
             ]
-          td [] [ encLocText typs.[req.requestType] ]
+          td [] [ locStr typs.[req.requestType] ]
-          td [ reqExp req ] [ encodedText (match req.requestor with Some r -> r | None -> " ") ]
+          td [ reqExp req ] [ str (match req.requestor with Some r -> r | None -> " ") ]
           td [] [
             yield
               match 60 > reqText.Length with
@@ -210,42 +209,45 @@ let maintain (reqs : PrayerRequest seq) (grp : SmallGroup) onlyActive (ctx : Htt
             ]
           ])
     |> List.ofSeq
-  [ div [ _class "pt-center-text" ] [
+  [ yield div [ _class "pt-center-text" ] [
       br []
       a [ _href (sprintf "/prayer-request/%s/edit" emptyGuid); _title s.["Add a New Request"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New Request"] ]
+        [ icon "add_circle"; rawText " &nbsp;"; locStr s.["Add a New Request"] ]
       rawText " &nbsp; &nbsp; &nbsp; "
       a [ _href "/prayer-requests/view"; _title s.["View Prayer Request List"].Value ]
-        [ icon "list"; rawText " &nbsp;"; encLocText s.["View Prayer Request List"] ]
+        [ icon "list"; rawText " &nbsp;"; locStr s.["View Prayer Request List"] ]
       br []
       br []
       ]
-    tableSummary requests.Length s
+    yield tableSummary requests.Length s
-    table [ _class "pt-table pt-action-table" ] [
+    match requests.Length with
-      thead [] [
+    | 0 -> ()
-        tr [] [
+    | _ ->
-          th [] [ encLocText s.["Actions"] ]
+        yield table [ _class "pt-table pt-action-table" ] [
-          th [] [ encLocText s.["Updated Date"] ]
+          thead [] [
-          th [] [ encLocText s.["Type"] ]
+            tr [] [
-          th [] [ encLocText s.["Requestor"] ]
+              th [] [ locStr s.["Actions"] ]
-          th [] [ encLocText s.["Request"] ]
+              th [] [ locStr s.["Updated Date"] ]
+              th [] [ locStr s.["Type"] ]
+              th [] [ locStr s.["Requestor"] ]
+              th [] [ locStr s.["Request"] ]
+              ]
+            ]
+          tbody [] requests
           ]
-        ]
+    yield div [ _class "pt-center-text" ] [
-      tbody [] requests
-      ]
-    div [ _class "pt-center-text" ] [
       yield br []
       match onlyActive with
       | true ->
-          yield encLocText s.["Inactive requests are currently not shown"]
+          yield locStr s.["Inactive requests are currently not shown"]
           yield br []
-          yield a [ _href "/prayer-requests/inactive" ] [ encLocText s.["Show Inactive Requests"] ]
+          yield a [ _href "/prayer-requests/inactive" ] [ locStr s.["Show Inactive Requests"] ]
       | false ->
-          yield encLocText s.["Inactive requests are currently shown"]
+          yield locStr s.["Inactive requests are currently shown"]
           yield br []
-          yield a [ _href "/prayer-requests" ] [ encLocText s.["Do Not Show Inactive Requests"] ]
+          yield a [ _href "/prayer-requests" ] [ locStr s.["Do Not Show Inactive Requests"] ]
       ]
-    form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
+    yield form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
     ]
   |> Layout.Content.wide
   |> Layout.standard vi "Maintain Requests"
@@ -266,7 +268,7 @@ let print m version =
             _alt imgAlt
             _title imgAlt ]
       space
-      encodedText version
+      str version
       ]
     ]
   |> Layout.bare pageTitle
@@ -283,7 +285,7 @@ let view m vi =
       yield a [ _class "pt-icon-link"
                 _href (sprintf "/prayer-requests/print/%s" dtString)
                 _title s.["View Printable"].Value ] [
-        icon "print"; rawText " &nbsp;"; encLocText s.["View Printable"]
+        icon "print"; rawText " &nbsp;"; locStr s.["View Printable"]
         ]
       match m.canEmail with
       | true ->
@@ -299,19 +301,19 @@ let view m vi =
               yield a [ _class "pt-icon-link"
                         _href (sprintf "/prayer-requests/view/%s" (sunday.ToString "yyyy-MM-dd"))
                         _title s.["List for Next Sunday"].Value ] [
-                icon "update"; rawText " &nbsp;"; encLocText s.["List for Next Sunday"]
+                icon "update"; rawText " &nbsp;"; locStr s.["List for Next Sunday"]
                 ]
               yield spacer
-          let emailPrompt = s.["This will e-mail the current list to every member of your class, without further prompting.  Are you sure this is what you are ready to do?"].Value
+          let emailPrompt = s.["This will e-mail the current list to every member of your group, without further prompting.  Are you sure this is what you are ready to do?"].Value
           yield a [ _class "pt-icon-link"
                     _href (sprintf "/prayer-requests/email/%s" dtString)
                     _title s.["Send via E-mail"].Value
                     _onclick (sprintf "return PT.requests.view.promptBeforeEmail('%s')" emailPrompt) ] [
-            icon "mail_outline"; rawText " &nbsp;"; encLocText s.["Send via E-mail"]
+            icon "mail_outline"; rawText " &nbsp;"; locStr s.["Send via E-mail"]
             ]
           yield spacer
           yield a [ _class "pt-icon-link"; _href "/prayer-requests"; _title s.["Maintain Prayer Requests"].Value ] [
-            icon "compare_arrows"; rawText " &nbsp;"; encLocText s.["Maintain Prayer Requests"]
+            icon "compare_arrows"; rawText " &nbsp;"; locStr s.["Maintain Prayer Requests"]
             ]
       | false -> ()
       ]

src/PrayerTracker.UI/PrayerTracker.UI.fsproj

@@ -13,7 +13,6 @@
     <Compile Include="CommonFunctions.fs" />
     <Compile Include="Layout.fs" />
     <Compile Include="Church.fs" />
-    <Compile Include="Help.fs" />
     <Compile Include="Home.fs" />
     <Compile Include="PrayerRequest.fs" />
     <Compile Include="SmallGroup.fs" />
@@ -21,13 +20,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="3.1.0" />
+    <PackageReference Include="Giraffe" Version="3.6.0" />
-    <PackageReference Include="MailKit" Version="2.0.6" />
+    <PackageReference Include="MailKit" Version="2.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,33 +37,6 @@
     <EmbeddedResource Update="Resources\Common.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Group\Announcement.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Group\Members.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Group\Preferences.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Requests\Edit.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Requests\Maintain.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Requests\View.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\User\LogOn.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\User\Password.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resources\Views\Help\Index.es.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
     <EmbeddedResource Update="Resources\Views\Home\Error.es.resx">
       <Generator>ResXFileCodeGenerator</Generator>
     </EmbeddedResource>
@@ -89,7 +61,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Update="FSharp.Core" Version="4.6.2" />
   </ItemGroup>
 
 </Project>

src/PrayerTracker.UI/Resources/Common.es.resx

@@ -120,9 +120,6 @@
   <data name="Actions" xml:space="preserve">
     <value>Acciones</value>
   </data>
-  <data name="Add / Edit a Request" xml:space="preserve">
-    <value>Agregar / Editar una Petición</value>
-  </data>
   <data name="Add a New Church" xml:space="preserve">
     <value>Agregar una Iglesia Nueva</value>
   </data>
@@ -177,15 +174,6 @@
   <data name="Churches" xml:space="preserve">
     <value>Iglesias</value>
   </data>
-  <data name="Click for Help on This Page" xml:space="preserve">
-    <value>Haga Clic para Obtener Ayuda en Esta Página</value>
-  </data>
-  <data name="Click to Close This Window" xml:space="preserve">
-    <value>Haga Clic para Cerrar Esta Ventana</value>
-  </data>
-  <data name="Close Window" xml:space="preserve">
-    <value>Cerrar Esta Ventana</value>
-  </data>
   <data name="Current Requests" xml:space="preserve">
     <value>Peticiones Actuales</value>
   </data>
@@ -441,9 +429,6 @@
   <data name="To make it active again, update it as necessary, leave “{0}” and “{1}” unchecked, and it will return as an active request." xml:space="preserve">
     <value>Para que sea más activa de nuevo, que se actualizará cuando sea necesario, salir de “{0}” y “{1}” no seleccionado, y volverá como una petición activa.</value>
   </data>
-  <data name="Toggle Navigation" xml:space="preserve">
-    <value>Navegación de Palanca</value>
-  </data>
   <data name="Updated" xml:space="preserve">
     <value>Actualizaron</value>
   </data>
@@ -519,9 +504,6 @@
   <data name="E-mail Format" xml:space="preserve">
     <value>Formato de Correo Electrónico</value>
   </data>
-  <data name="E-mail “From” Name and Address" xml:space="preserve">
-    <value>Correo Electrónico “De” Nombre y Dirección</value>
-  </data>
   <data name="Edit Group Member" xml:space="preserve">
     <value>Editar el Miembro del Grupo</value>
   </data>
@@ -531,9 +513,6 @@
   <data name="Fonts" xml:space="preserve">
     <value>Fuentes</value>
   </data>
-  <data name="Fonts{0} for List" xml:space="preserve">
-    <value>Fuentes{0} de la Lista</value>
-  </data>
   <data name="Group Log On" xml:space="preserve">
     <value>Iniciar Sesión como Grupo</value>
   </data>
@@ -549,9 +528,6 @@
   <data name="Long-Term Requests Alerted for Update" xml:space="preserve">
     <value>Peticiones a Largo Plazo Alertó para la Actualización</value>
   </data>
-  <data name="Making a “Large Print” List" xml:space="preserve">
-    <value>Realización de una Lista de “Letra Grande”</value>
-  </data>
   <data name="Password Protected" xml:space="preserve">
     <value>Protegido por Contraseña</value>
   </data>
@@ -588,9 +564,6 @@
   <data name="List for Next Sunday" xml:space="preserve">
     <value>Lista para el Próximo Domingo</value>
   </data>
-  <data name="Restore an Inactive Request" xml:space="preserve">
-    <value>Restaurar una Petición Inactivo</value>
-  </data>
   <data name="Send via E-mail" xml:space="preserve">
     <value>Enviar por correo electrónico</value>
   </data>
@@ -736,7 +709,7 @@
     <value>Este Grupo</value>
   </data>
   <data name="This will e-mail the current list to every member of your class, without further prompting.  Are you sure this is what you are ready to do?" xml:space="preserve">
-    <value>Esto enviará un correo electrónico la lista actual de todos los miembros de su clase, sin más indicaciones. ¿Estás seguro de que esto es lo que están dispuestos a hacer?</value>
+    <value>Esto enviará un correo electrónico la lista actual de todos los miembros de su grupo, sin más indicaciones. ¿Estás seguro de que esto es lo que están dispuestos a hacer?</value>
   </data>
   <data name="To change your password, enter your current password in the specified box below, then enter your new password twice." xml:space="preserve">
     <value>Para cambiar su contraseña, introduzca su contraseña actual en el cuadro se especifica a continuación, introduzca su nueva contraseña dos veces.</value>
@@ -762,9 +735,6 @@
   <data name="Edit This Prayer Request" xml:space="preserve">
     <value>Editar esta petición de oración</value>
   </data>
-  <data name="Expire a Request" xml:space="preserve">
-    <value>Expirar una petición</value>
-  </data>
   <data name="Expire This Request Immediately" xml:space="preserve">
     <value>Expirar esta petición de oración de inmediato</value>
   </data>
@@ -846,4 +816,7 @@
   <data name="View source code and get technical support" xml:space="preserve">
     <value>Ver código fuente y obtener soporte técnico</value>
   </data>
+  <data name="Click for Help on This Page" xml:space="preserve">
+    <value>Haga Clic para Obtener Ayuda en Esta Página</value>
+  </data>
 </root>

src/PrayerTracker.UI/Resources/Views/Help/Group/Announcement.es.resx

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="If you check this box, however, the text of the announcement will be added to your prayer list under the section you have selected." xml:space="preserve">
-    <value>Si marca esta caja, sin embargo, el texto del anuncio será añadido a su lista de oración en la sección que ha seleccionado.</value>
-  </data>
-  <data name="It functions the same way as the text box on the “&lt;a href=\&quot;{0}\&quot;&gt;{1}&lt;/a&gt;” page." xml:space="preserve">
-    <value>Funciona de la misma forma que el cuadro de texto en la página “&lt;a href="{0}"&gt;{1}&lt;/a&gt;”.</value>
-  </data>
-  <data name="This is the text of the announcement you would like to send." xml:space="preserve">
-    <value>Este es el texto del anuncio que desea enviar.</value>
-  </data>
-  <data name="Without this box checked, the text of the announcement will only be e-mailed to your group members." xml:space="preserve">
-    <value>Sin esta caja marcada, el texto del anuncio sólo será por correo electrónico a los miembros del su grupo.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Group/Members.es.resx

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="(Of course, if you delete it in error, you can enter it again using the “Add” instructions above.)" xml:space="preserve">
-    <value>(Por supuesto, si usted lo elimine por error, se puede entrar de nuevo utilizando la opción “Agregar” instrucciones de arriba.)</value>
-  </data>
-  <data name="From this page, you can add, edit, and delete the e-mail addresses for your group." xml:space="preserve">
-    <value>Desde esta página, usted puede agregar, editar y eliminar las direcciones de correo electrónico para su grupo.</value>
-  </data>
-  <data name="Note that once an e-mail address has been deleted, it is gone." xml:space="preserve">
-    <value>Tenga en cuenta que una vez que la dirección de correo electrónico se ha eliminado, se ha ido.</value>
-  </data>
-  <data name="This will allow you to update the name and/or the e-mail address for that member." xml:space="preserve">
-    <value>Esto le permitirá actualizar el nombre y / o la dirección de correo electrónico para ese miembro.</value>
-  </data>
-  <data name="To add an e-mail address, click the icon or text in the center of the page, below the title and above the list of addresses for your group." xml:space="preserve">
-    <value>Para agregar una dirección de correo electrónico, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de direcciones para su grupo.</value>
-  </data>
-  <data name="To delete an e-mail address, click the blue trash can icon in the “{0}” column." xml:space="preserve">
-    <value>Para eliminar una dirección de correo electrónico, haga clic en el icono azul de la papelera en la columna “{0}”.</value>
-  </data>
-  <data name="To edit an e-mail address, click the blue pencil icon; it's the first icon under the “{0}” column heading." xml:space="preserve">
-    <value>Para editar una dirección de correo electrónico, haga clic en el icono de lápiz azul, es el primer icono bajo el título de columna “{0}”.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Group/Preferences.es.resx

@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="(Changing this password will force all members of the group who logged in with the “{0}” box checked to provide the new password.)" xml:space="preserve">
-    <value>(Cambiar esta contraseña obligará a todos los miembros del grupo que se iniciar sesión en el "{0}" caja marcada para proporcionar la nueva contraseña.)</value>
-  </data>
-  <data name="(NOTE: In the plain-text e-mail, new requests are bulleted with a “+” symbol, and old are bulleted with a “-” symbol.)" xml:space="preserve">
-    <value>(NOTA: En el texto sin formato de correo electrónico, las nuevas solicitudes se identifican con un símbolo “+”, y pide a los viejos se identifican con un símbolo “-”.)</value>
-  </data>
-  <data name="A warning is good here; just because you have an obscure font and like the way that it looks does not mean that others have that same font." xml:space="preserve">
-    <value>Una advertencia de que es bueno aquí, sólo porque usted tiene una fuente oscura y gusta la forma en que se vea no significa que los demás tienen de que la misma fuente.</value>
-  </data>
-  <data name="All categories respect this setting." xml:space="preserve">
-    <value>Todas las categorías respetar esta opción.</value>
-  </data>
-  <data name="As this is a shared password, it is stored in plain text, so you can easily see what it is." xml:space="preserve">
-    <value>Como se trata de una contraseña compartida, se almacena en texto plano, así que usted puede ver fácilmente lo que es.</value>
-  </data>
-  <data name="By default, requests are sorted within each group by the last updated date, with the most recent on top." xml:space="preserve">
-    <value>De forma predeterminada, las solicitudes se ordenan dentro de cada grupo por la última fecha de actualización, con el más reciente en la parte superior.</value>
-  </data>
-  <data name="Changing at least the e-mail address to your address will ensure that you receive these e-mails, and can prune your e-mail list accordingly." xml:space="preserve">
-    <value>Cambiar por lo menos la dirección de correo electrónico a su dirección se asegurará de que usted recibe estos correos electrónicos, y se puede podar su lista de correo electrónico en consecuencia.</value>
-  </data>
-  <data name="Each section is addressed below." xml:space="preserve">
-    <value>Cada sección se aborda más adelante.</value>
-  </data>
-  <data name="However, some e-mail clients may not display this properly, so you can choose to default the email to a plain-text format, which does not have colors, italics, or other formatting." xml:space="preserve">
-    <value>Sin embargo, algunos clientes de correo electrónico no puede mostrar esto correctamente, para que pueda elegir el correo electrónico a un formato de texto plano predeterminadas, que no tiene colores, cursiva, u otro formato.</value>
-  </data>
-  <data name="If you do a typo correction on a request, if you do not check the box to update the date, this setting will change the bullet." xml:space="preserve">
-    <value>Si usted hace una corrección de errata en una petición, si no marque la caja para actualizar la fecha, este valor va a cambiar la bala.</value>
-  </data>
-  <data name="If you do not see your time zone listed, just &lt;a href=\&quot;mailto:daniel@djs-consulting.com?subject={0}%20{1}\&quot;&gt;contact Daniel&lt;/a&gt; and tell him what time zone you need." xml:space="preserve">
-    <value>Si no puede ver la zona horaria en la lista, ponte en &lt;a href="mailto:daniel@djs-consulting.com?subject={1}%20por%20{0}"&gt;contacto con Daniel&lt;/a&gt; y decirle lo que la zona horaria que usted necesita.</value>
-  </data>
-  <data name="If you select “{0}” but do not enter a password, the list remains private, which is also the default value." xml:space="preserve">
-    <value>Si selecciona "{0}" pero no introduce una contraseña, la lista sigue siendo privado, que también es el valor predeterminado.</value>
-  </data>
-  <data name="If you would prefer to have the list sorted by requestor or subject rather than by date, select “{0}” instead." xml:space="preserve">
-    <value>Si prefiere tener la lista ordenada por el solicitante o el sujeto en vez de por fecha, seleccione “{0}” en su lugar.</value>
-  </data>
-  <data name="If your group is comprised mostly of people who prefer large print, the following settings will make your list look like the typical large-print publication:" xml:space="preserve">
-    <value>Si el grupo está compuesta en su mayoría de la gente que prefiere letras grandes, los siguientes ajustes harán que su lista de parecerse a la típica la publicación “Letra Grande”:</value>
-  </data>
-  <data name="It is generally best to stick with the fonts that come with Windows - fonts like “Arial”, “Times New Roman”, “Tahoma”, and “Comic Sans MS”." xml:space="preserve">
-    <value>Generalmente es mejor quedarse con las fuentes que vienen con Windows - Fuentes como “Arial”, “Times New Roman”, “Tahoma”, y “Comic Sans MS”.</value>
-  </data>
-  <data name="Note that the categories “{0}” and “{1}” never expire automatically." xml:space="preserve">
-    <value>Tenga en cuenta que las categorías “{0}” y “{1}” no expirará automáticamente.</value>
-  </data>
-  <data name="Password-protected lists allow group members to log in and view the current request list online, using the “{0}” link and providing this password." xml:space="preserve">
-    <value>Protegidos con contraseña listas permiten miembros del grupo iniciar sesión y ver la lista de peticiones actual en el sito, utilizando el "{0}" enlace y proporcionar la contraseña.</value>
-  </data>
-  <data name="Public lists are available without logging in, and private lists are only available online to administrators (though the list can still be sent via e-mail by an administrator)." xml:space="preserve">
-    <value>Las listas públicas están disponibles sin iniciar sesión, y listas privadas sólo están disponibles en línea a los administradores (aunque la lista todavía puede ser enviado por correo electrónico por el administrador).</value>
-  </data>
-  <data name="Requests that have been updated within this many days are identified by a hollow circle for their bullet, as opposed to a filled circle for other requests." xml:space="preserve">
-    <value>Peticiones que han sido actualizadas dentro de esta cantidad de días se identifican por un círculo hueco para su bala, en oposición a un círculo relleno para otras peticiones.</value>
-  </data>
-  <data name="Requests that have not been updated in this many weeks are identified by an italic font on the “{0}” page, to remind you to seek updates on these requests so that your prayers can stay relevant and current." xml:space="preserve">
-    <value>Peticiones que no han sido actualizados en esta semana muchos se identifican con un tipo de letra cursiva en la página “{0}”, para recordarle que debe buscar novedades en estas peticiones para que vuestras oraciones pueden permanecer relevante y actual.</value>
-  </data>
-  <data name="The background color cannot be changed." xml:space="preserve">
-    <value>El color de fondo no puede ser cambiado.</value>
-  </data>
-  <data name="The default for the heading is 16pt, and the default for the text is 12pt." xml:space="preserve">
-    <value>El valor predeterminado para el título es 16 puntos, y el valor por defecto para el texto es 12 puntos.</value>
-  </data>
-  <data name="The default name is “PrayerTracker”, and the default e-mail address is “prayer@djs-consulting.com”." xml:space="preserve">
-    <value>El nombre predeterminado es “PrayerTracker”, y el valor predeterminado dirección de correo electrónico es “prayer@djs-consulting.com”.</value>
-  </data>
-  <data name="The group's request list can be either public, private, or password-protected." xml:space="preserve">
-    <value>La lista de peticiones del grupo puede ser pública, privada o protegida por contraseña.</value>
-  </data>
-  <data name="The setting on this page is the group default; you can select a format for each recipient on the “{0}” page." xml:space="preserve">
-    <value>La configuración en esta página es el valor predeterminado del grupo, se puede seleccionar un formato para cada destinatario de la página “{0}”.</value>
-  </data>
-  <data name="The {0} default is HTML, which sends the list just as you see it online." xml:space="preserve">
-    <value>El valor predeterminado de {0} es HTML, el cual envía la lista al igual que usted lo ve en el sitio.</value>
-  </data>
-  <data name="There is a link on the bottom of the page to a color list with more names and their RGB values, if you're really feeling artistic." xml:space="preserve">
-    <value>Hay un enlace en la parte inferior de la página para una lista de colores con más nombres y sus valores RGB, si realmente estás sintiendo artística.</value>
-  </data>
-  <data name="This is a comma-separated list of fonts that will be used for your request list." xml:space="preserve">
-    <value>Esta es una lista separada por comas de fuentes que se utilizarán para su lista de peticiones.</value>
-  </data>
-  <data name="This is the default e-mail format for your group." xml:space="preserve">
-    <value>Este es el valor predeterminado formato de correo electrónico para su grupo.</value>
-  </data>
-  <data name="This is the point size to use for each." xml:space="preserve">
-    <value>Este es el tamaño de punto a utilizar para cada uno.</value>
-  </data>
-  <data name="This is the time zone that you would like to use for your group." xml:space="preserve">
-    <value>Esta es la zona horaria que desea utilizar para su clase.</value>
-  </data>
-  <data name="This page allows you to change how your prayer request list looks and behaves." xml:space="preserve">
-    <value>Esta página le permite cambiar la forma en que su lista de peticiones de la oración se ve y se comporta.</value>
-  </data>
-  <data name="This will work, but any bounced e-mails and out-of-office replies will be sent to that address (which is not even a real address)." xml:space="preserve">
-    <value>Esto funciona, pero los mensajes devueltos, y las respuestas de fuera de la oficina serán enviados a esa dirección (que no es ni siquiera una dirección real).</value>
-  </data>
-  <data name="When a regular request goes this many days without being updated, it expires and no longer appears on the request list." xml:space="preserve">
-    <value>Cuando una petición regular va esta cantidad de días sin actualizar, caduca y ya no aparece en la lista de peticiones.</value>
-  </data>
-  <data name="You can customize the colors that are used for the headings and lines in your request list." xml:space="preserve">
-    <value>Usted puede personalizar los colores que se utilizan para las partidas y líneas en su lista de peticiones.</value>
-  </data>
-  <data name="You can select one of the 16 named colors in the drop down lists, or you can “mix your own” using red, green, and blue (RGB) values between 0 and 255." xml:space="preserve">
-    <value>Puede seleccionar uno de los 16 colores con nombre en las listas desplegables, o puede “mezclar su propia” en colores rojo, verde y azul (RGB) valores entre 0 y 255.</value>
-  </data>
-  <data name="You should also end the font list with either “serif” or “sans-serif”, which will use the browser's default serif (like “Times New Roman”) or sans-serif (like “Arial”) font." xml:space="preserve">
-    <value>También debe poner fin a la lista de fuentes, ya sea con “serif” o el “sans-serif”, que utilizará el fuente serif predeterminado (como “Times New Roman”) o el fuente sans-serif predeterminado (como “Arial”).</value>
-  </data>
-  <data name="{0} must put an name and e-mail address in the “from” position of each e-mail it sends." xml:space="preserve">
-    <value>{0} debe poner el nombre y la dirección de correo electrónico en el “de” posición de cada correo electrónico que envía.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Index.es.resx

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Clicking this will open a new, small window with directions on using that page." xml:space="preserve">
-    <value>Al hacer clic en esta opción, se abrirá una nueva y pequeña ventana con instrucciones sobre cómo usar esa página.</value>
-  </data>
-  <data name="If you are looking for a quick overview of {0}, start with the “{1}” and “{2}” entries." xml:space="preserve">
-    <value>Si está buscando una descripción rápida de {0}, comience con las entradas "{1}" y "{2}".</value>
-  </data>
-  <data name="Throughout {0}, you'll see this icon&amp;#xa0;&lt;i class=&quot;material-icons&quot; title=&quot;{1}&quot;&gt;help_outline&lt;/i&gt;&amp;#xa0;next to the title on each page." xml:space="preserve">
-    <value>En todo el sistema, verá este icono&amp;#xa0;&lt;i class="material-icons" title="{1}"&gt;help_outline&lt;/i&gt;&amp;#xa0;junto al título de cada página.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Requests/Edit.es.resx

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Apart from the icons on the request maintenance page, this is the only other way to expire “{0}” and “{1}” requests, but it can be used for any request type." xml:space="preserve">
-    <value>Aparte de los iconos de la página de mantenimiento de las peticiones, ésta es la única otra forma de expirar peticiones del tipos “{0}” y “{1}”, pero puede ser utilizada para cualquier tipo de petición.</value>
-  </data>
-  <data name="Click or tab into the box to display the calendar, which will be preselected to today's date." xml:space="preserve">
-    <value>Haga clic en la pestaña o en la caja para mostrar el calendario, que será preseleccionada para la fecha de hoy.</value>
-  </data>
-  <data name="For all types, it is optional; I used to have an announcement with no subject that ran every week, telling where to send requests and updates." xml:space="preserve">
-    <value>Para todos los tipos, es opcional, yo solía tener un anuncio con ningún tema que iba todas las semanas, diciendo a dónde enviar peticiones y actualizaciones.</value>
-  </data>
-  <data name="For announcements, this should contain the subject of the announcement." xml:space="preserve">
-    <value>Para los anuncios, este debe contener el objeto del anuncio.</value>
-  </data>
-  <data name="For existing requests, there will be a check box labeled “{0}”." xml:space="preserve">
-    <value>Para peticiones existentes, habrá una casilla de verificación “{0}”.</value>
-  </data>
-  <data name="For new requests, this is a box with a calendar date picker." xml:space="preserve">
-    <value>Para nuevas peticiones, se trata de una caja con un selector de fechas del calendario.</value>
-  </data>
-  <data name="For requests or praises, this field is for the name of the person who made the request or offered the praise report." xml:space="preserve">
-    <value>Para las peticiones o alabanzas, este campo es el nombre de la persona que hizo la petición o que ofrece el informe de alabanza.</value>
-  </data>
-  <data name="Hover over each icon to see what each button does." xml:space="preserve">
-    <value>Pase el ratón sobre cada icono para ver qué hace cada botón.</value>
-  </data>
-  <data name="If you are editing an existing request, a third option appears." xml:space="preserve">
-    <value>Si está editando una petición existente, aparece una tercera opción.</value>
-  </data>
-  <data name="It also supports undo and redo, and the editor supports full-screen mode." xml:space="preserve">
-    <value>También es compatible con deshacer y rehacer, y el editor soporta modo de pantalla completa.</value>
-  </data>
-  <data name="The editor provides many formatting capabilities, including “Spell Check as you Type” (enabled by default), “Paste from Word”, and “Paste Plain”, as well as “Source” view, if you want to edit the HTML yourself." xml:space="preserve">
-    <value>El editor ofrece muchas capacidades de formato, como "El Corrector Ortográfico al Escribir" (habilitado predeterminado), "Pegar desde Word" y "Pegar sin formato", así como "Código Fuente" punto de vista, si quieres editar el código HTML usted mismo.</value>
-  </data>
-  <data name="The order above is the order in which the request types appear on the list." xml:space="preserve">
-    <value>El orden anterior es el orden en que los tipos de peticiones aparecen en la lista.</value>
-  </data>
-  <data name="There are 5 request types in {0}." xml:space="preserve">
-    <value>Hay 5 tipos de peticiones en {0}.</value>
-  </data>
-  <data name="This can be used if you are correcting spelling or punctuation, and do not have an actual update to make to the request." xml:space="preserve">
-    <value>Esto puede ser usado si corrige la ortografía ni la puntuacion, y no tienen una actualización real de hacer la petición.</value>
-  </data>
-  <data name="This is the text of the request." xml:space="preserve">
-    <value>Este es el texto de la petición.</value>
-  </data>
-  <data name="This page allows you to enter or update a new prayer request." xml:space="preserve">
-    <value>Esta página le permite introducir o actualizar una petición de oración nueva.</value>
-  </data>
-  <data name="“{0}” and “{1}” are not subject to the automatic expiration (set on the “{2}” page) that the other requests are." xml:space="preserve">
-    <value>“{0}” y “{1}” no están sujetos a la caducidad automática (establecida en el “{2}” de la página) que las peticiones son otros.</value>
-  </data>
-  <data name="“{0}” are like “{1}”, but instead of a request, they are simply passing information along about something coming up." xml:space="preserve">
-    <value>“{0}” son como “{1}”, pero en lugar de una petición, simplemente se pasa la información a lo largo de algo por venir.</value>
-  </data>
-  <data name="“{0}” are like “{1}”, but they are answers to prayer to share with your group." xml:space="preserve">
-    <value>“{0}” son como “{1}”, pero son respuestas a la oración para compartir con su grupo.</value>
-  </data>
-  <data name="“{0}” are requests that may occur repeatedly or continue indefinitely." xml:space="preserve">
-    <value>“{0}” son peticiones que pueden ocurrir varias veces, o continuar indefinidamente.</value>
-  </data>
-  <data name="“{0}” are your regular requests that people may have regarding things happening over the next week or so." xml:space="preserve">
-    <value>“{0}” son sus peticiones habituales que la gente pueda tener acerca de las cosas que suceden durante la próxima semana o así.</value>
-  </data>
-  <data name="“{0}” can be used to make a request never expire (note that this is redundant for “{1}” and “{2}”)." xml:space="preserve">
-    <value>“{0}” se puede utilizar para hacer una petición que no caduque nunca (nótese que esto es redundante para los tipos “{1}” y “{2}”).</value>
-  </data>
-  <data name="“{0}” is for those who are pregnant.&quot;" xml:space="preserve">
-    <value>“{0}” es para aquellos que están embarazadas.</value>
-  </data>
-  <data name="“{0}” means that the request is subject to the expiration days in the group preferences." xml:space="preserve">
-    <value>“{0}” significa que la petición está sujeta a los días de vencimiento de las preferencias del grupo.</value>
-  </data>
-  <data name="“{0}” will make the request expire when it is saved." xml:space="preserve">
-    <value>“{0}” hará que la petición expirará cuando se guarda.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Requests/Maintain.es.resx

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Deleting a request is contrary to the intent of {0}, as you can retrieve requests that have expired." xml:space="preserve">
-    <value>Eliminación de una petición es contraria a la intención de {0}, como se puede recuperar peticiones que han expirado.</value>
-  </data>
-  <data name="For active requests, the second icon is an eye with a slash through it; clicking this icon will expire the request immediately." xml:space="preserve">
-    <value>Para las peticiones activas, el segundo icono es un ojo con una barra a través de él; Si hace clic en este icono, la petición se cancelará inmediatamente.</value>
-  </data>
-  <data name="From this page, you can add, edit, and delete your current requests." xml:space="preserve">
-    <value>Desde esta página, usted puede agregar, editar y borrar sus peticiones actuales.</value>
-  </data>
-  <data name="However, clicking the link at the bottom of the page will refresh the page with the inactive requests shown." xml:space="preserve">
-    <value>Sin embargo, al hacer clic en el vínculo en la parte inferior de la página se actualizará la página con las peticiones se muestran inactivos.</value>
-  </data>
-  <data name="However, if there is a request that needs to be deleted, clicking the blue trash can icon in the “{0}” column will allow you to do it." xml:space="preserve">
-    <value>Sin embargo, si hay una solicitud que debe ser eliminado, haga clic en el icono azul de la papelera en la columna “{0}” le permitirá hacerlo.</value>
-  </data>
-  <data name="The last updated date will be current, and the request is set to expire normally." xml:space="preserve">
-    <value>La última fecha actualizada será actual, y la petición se establece para caducar normalmente.</value>
-  </data>
-  <data name="The middle icon will look like an eye; clicking it will restore the request as an active request." xml:space="preserve">
-    <value>El icono del centro se verá como un ojo; Haciendo clic en él, restaurará la petición como una petición activa.</value>
-  </data>
-  <data name="This is equivalent to editing the request, selecting “{0}”, and saving it." xml:space="preserve">
-    <value>Esto equivale a editar la petición, seleccionar "{0}" y guardarla.</value>
-  </data>
-  <data name="To add a request, click the icon or text in the center of the page, below the title and above the list of requests for your group." xml:space="preserve">
-    <value>Para agregar una petición, haga clic en el icono o el texto en el centro de la página, debajo del título y por encima de la lista de peticiones para su grupo.</value>
-  </data>
-  <data name="To edit a request, click the blue pencil icon; it's the first icon under the “{0}” column heading." xml:space="preserve">
-    <value>Para editar una petición, haga clic en el icono de lápiz azul, el primer icono bajo el título de columna “{0}”.</value>
-  </data>
-  <data name="Use this option carefully, as these deletions cannot be undone; once a request is deleted, it is gone for good." xml:space="preserve">
-    <value>Utilice esta opción con cuidado, ya que estas supresiones no se puede deshacer, una vez a la petición se ha borrado, ha desaparecido para siempre.</value>
-  </data>
-  <data name="When the page is first displayed, it does not display inactive requests." xml:space="preserve">
-    <value>Cuando la página se muestra por primera vez, que no muestra peticiones inactivos.</value>
-  </data>
-  <data name="You can also restore requests that may have expired, but should be made active once again." xml:space="preserve">
-    <value>También puede restaurar peticiones que han caducado, sino que debe ser activa, una vez más.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/Requests/View.es.resx

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="(NOTE: If you are logged in as a group member, the only option you will see is to view a printable list.)" xml:space="preserve">
-    <value>(NOTA: Si usted está registrado como miembro de la clase, la única opción que se ve es para ver una lista para imprimir.)</value>
-  </data>
-  <data name="Clicking this link will display the list in a format that is suitable for printing; it does not have the normal {0} header across the top." xml:space="preserve">
-    <value>Hacer clic en este vínculo, se muestra la lista en un formato que sea adecuado para imprimir, sino que no tiene el encabezado normal de {0} en la parte superior.</value>
-  </data>
-  <data name="Clicking this link will send the list you are currently viewing to your group members." xml:space="preserve">
-    <value>Al hacer clic en este enlace le enviará la lista que está viendo en ese momento a los miembros del grupo.</value>
-  </data>
-  <data name="From this page, you can view the request list (for today or for the next Sunday), view a printable version of the list, and e-mail the list to the members of your group." xml:space="preserve">
-    <value>Desde esta página, puede ver la lista de peticiones (para hoy o para el próximo Domingo), ver una versión imprimible de la lista, y por correo electrónico la lista de los miembros de su grupo.</value>
-  </data>
-  <data name="If you proceed, you will see a page that shows to whom the list was sent, and what the list looked like." xml:space="preserve">
-    <value>Si continúa, usted verá una página que muestra a la que la lista fue enviado, y lo que la lista parecía.</value>
-  </data>
-  <data name="Note that this link does not appear if it is Sunday." xml:space="preserve">
-    <value>Tenga en cuenta que este enlace no aparece si es Domingo.</value>
-  </data>
-  <data name="Once you have clicked the link, you can print it using your browser's standard “Print” functionality." xml:space="preserve">
-    <value>Una vez que haya hecho clic en el enlace, se puede imprimir con el navegador estándar de “Imprimir” funcionalidad.</value>
-  </data>
-  <data name="The page will remind you that you are about to do that, and ask for your confirmation." xml:space="preserve">
-    <value>La página te recordará que estás a punto de hacerlo, y pedir su confirmación.</value>
-  </data>
-  <data name="This can be used, for example, to see what requests will expire, or allow you to print a list with Sunday's date on Saturday evening." xml:space="preserve">
-    <value>Esto puede ser usado, por ejemplo, para ver lo que peticiones de caducidad, ni le permite imprimir una lista con la fecha del Domingo en la noche del Sábado.</value>
-  </data>
-  <data name="This will modify the date for the list, so it will look like it is currently next Sunday." xml:space="preserve">
-    <value>Esto modificará la fecha de la lista, por lo que se verá como es en la actualidad el próximo Domingo.</value>
-  </data>
-  <data name="You may safely use your browser's “Back” button to navigate away from the page." xml:space="preserve">
-    <value>Usted puede utilizar con seguridad de su navegador botón “Atrás” para navegar fuera de la página.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/User/LogOn.es.resx

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="If you want {0} to remember you on your computer, click the “{1}” box before clicking the “{2}” button." xml:space="preserve">
-    <value>Si desea que {0} que le recuerde en su ordenador, haga clic en “{1}” caja antes de pulsar el “{2}” botón.</value>
-  </data>
-  <data name="If you want {0} to remember your group, click the “{1}” box before clicking the “{2}” button." xml:space="preserve">
-    <value>Si desea que {0} recuerde su grupo, haga clic en “{1}” caja antes de pulsar el “{2}” botón.</value>
-  </data>
-  <data name="If your group has defined a password to use to allow you to view their request list online, select your group from the drop down list, then enter the group password into the appropriate box." xml:space="preserve">
-    <value>Si el grupo se ha definido una contraseña para usar que le permite ver su lista de peticiones en línea, seleccionar el grupo en la lista desplegable y introduzca la contraseña del grupo en la caja correspondiente.</value>
-  </data>
-  <data name="Select your group, then enter your e-mail address and password into the appropriate boxes." xml:space="preserve">
-    <value>Seleccione su grupo y introduzca su dirección de correo electrónico y contraseña en las cajas apropiadas.</value>
-  </data>
-  <data name="There are two different levels of access for {0} - user and group." xml:space="preserve">
-    <value>Hay dos diferentes niveles de acceso para {0} - el usuario y el grupo.</value>
-  </data>
-  <data name="This page allows you to log on to {0}." xml:space="preserve">
-    <value>Esta página le permite acceder a {0}.</value>
-  </data>
-</root>

src/PrayerTracker.UI/Resources/Views/Help/User/Password.es.resx

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="&lt;a href=&quot;mailto:daniel@djs-consulting.com?subject={0}%20Password%20Help&quot;&gt;Click here to request help resetting your password&lt;/a&gt;." xml:space="preserve">
-    <value>&lt;a href="mailto:daniel@djs-consulting.com?subject=Ayuda%20de%20Contraseña%20de%20{0}"&gt;Haga clic aquí para solicitar ayuda para restablecer su contraseña&lt;/a&gt;.</value>
-  </data>
-  <data name="Enter your existing password in the top box, then enter your new password in the bottom two boxes." xml:space="preserve">
-    <value>Ingrese su contraseña actual en la caja superior y introduzca la nueva contraseña en la parte inferior dos cajas.</value>
-  </data>
-  <data name="Entering your existing password is a security measure; with the “{0}” box on the log in page, this will prevent someone else who may be using your computer from being able to simply go to the site and change your password." xml:space="preserve">
-    <value>Al entrar su contraseña actual es una medida de seguridad, con el “{0}” caja de la página inicio de sesión, esto evitará que otra persona que pueda estar usando su computadora de la posibilidad de simplemente ir a el sitio y cambiar la contraseña.</value>
-  </data>
-  <data name="If you cannot remember your existing password, we cannot retrieve it, but we can set it to something known so that you can then change it to your password." xml:space="preserve">
-    <value>Si no recuerdas tu contraseña actual, no podemos recuperar, pero podemos ponerlo en algo que se conoce de modo que usted puede cambiarlo a su contraseña.</value>
-  </data>
-  <data name="This page will let you change your password." xml:space="preserve">
-    <value>Esta página le permitirá cambiar su contraseña.</value>
-  </data>
-</root>

src/PrayerTracker.UI/SmallGroup.fs

@@ -15,20 +15,20 @@ let announcement isAdmin ctx vi =
       yield csrfToken ctx
       yield div [ _class "pt-field-row" ] [
         div [ _class "pt-field pt-editor" ] [
-          label [ _for "text" ] [ encLocText s.["Announcement Text"] ]
+          label [ _for "text" ] [ locStr s.["Announcement Text"] ]
           textarea [ _name "text"; _id "text"; _autofocus ] []
           ]
         ]
       match isAdmin with
-      | true -> 
+      | true ->
           yield div [ _class "pt-field-row" ] [
             div [ _class "pt-field" ] [
-              label [] [ encLocText s.["Send Announcement to"]; rawText ":" ]
+              label [] [ locStr s.["Send Announcement to"]; rawText ":" ]
               div [ _class "pt-center-text" ] [
                 radio "sendToClass" "sendY" "Y" "Y"
-                label [ _for "sendY" ] [ encLocText s.["This Group"]; rawText "     " ]
+                label [ _for "sendY" ] [ locStr s.["This Group"]; rawText "     " ]
                 radio "sendToClass" "sendN" "N" "Y"
-                label [ _for "sendN" ] [ encLocText s.["All {0} Users", s.["PrayerTracker"]] ]
+                label [ _for "sendN" ] [ locStr s.["All {0} Users", s.["PrayerTracker"]] ]
                 ]
               ]
             ]
@@ -37,12 +37,12 @@ let announcement isAdmin ctx vi =
       yield div [ _class "pt-field-row pt-fadeable pt-shown"; _id "divAddToList" ] [
         div [ _class "pt-checkbox-field" ] [
           input [ _type "checkbox"; _name "addToRequestList"; _id "addToRequestList"; _value "True" ]
-          label [ _for "addToRequestList" ] [ encLocText s.["Add to Request List"] ]
+          label [ _for "addToRequestList" ] [ locStr s.["Add to Request List"] ]
           ]
         ]
       yield div [ _class "pt-field-row pt-fadeable"; _id "divCategory" ] [
         div [ _class "pt-field" ] [
-          label [ _for "requestType" ] [ encLocText s.["Request Type"] ]
+          label [ _for "requestType" ] [ locStr s.["Request Type"] ]
           reqTypes
           |> Seq.ofList
           |> Seq.map (fun item -> fst item, (snd item).Value)
@@ -60,12 +60,12 @@ let announcement isAdmin ctx vi =
 /// View for once an announcement has been sent
 let announcementSent (m : Announcement) vi =
   let s = I18N.localizer.Force ()
-  [ span [ _class "pt-email-heading" ] [ encLocText s.["HTML Format"]; rawText ":" ]
+  [ span [ _class "pt-email-heading" ] [ locStr s.["HTML Format"]; rawText ":" ]
     div [ _class "pt-email-canvas" ] [ rawText m.text ]
     br []
     br []
-    span [ _class "pt-email-heading" ] [ encLocText s.["Plain-Text Format"]; rawText ":" ]
+    span [ _class "pt-email-heading" ] [ locStr s.["Plain-Text Format"]; rawText ":" ]
-    div [ _class "pt-email-canvas" ] [ pre [] [ encodedText (m.plainText ()) ] ]
+    div [ _class "pt-email-canvas" ] [ pre [] [ str (m.plainText ()) ] ]
     ]
   |> Layout.Content.standard
   |> Layout.standard vi "Announcement Sent"
@@ -77,21 +77,21 @@ let edit (m : EditSmallGroup) (churches : Church list) ctx vi =
   let pageTitle = match m.isNew () with true -> "Add a New Group" | false -> "Edit Group"
   form [ _action "/small-group/save"; _method "post"; _class "pt-center-columns" ] [
     csrfToken ctx
-    input [ _type "hidden"; _name "smallGroupId"; _value (m.smallGroupId.ToString "N") ]
+    input [ _type "hidden"; _name "smallGroupId"; _value (flatGuid m.smallGroupId) ]
     div [ _class "pt-field-row" ] [
       div [ _class "pt-field" ] [
-        label [ _for "name" ] [ encLocText s.["Group Name"] ]
+        label [ _for "name" ] [ locStr s.["Group Name"] ]
         input [ _type "text"; _name "name"; _id "name"; _value m.name; _required; _autofocus ]
         ]
       ]
     div [ _class "pt-field-row" ] [
       div [ _class "pt-field" ] [
-        label [ _for "churchId" ] [ encLocText s.["Church"] ]
+        label [ _for "churchId" ] [ locStr s.["Church"] ]
         seq {
           yield  "", selectDefault s.["Select Church"].Value
-          yield! churches |> List.map (fun c -> c.churchId.ToString "N", c.name)
+          yield! churches |> List.map (fun c -> flatGuid c.churchId, c.name)
           }
-        |> selectList "churchId" (m.churchId.ToString "N") [ _required ] 
+        |> selectList "churchId" (flatGuid m.churchId) [ _required ] 
         ]
       ]
     div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Group"] ]
@@ -108,20 +108,20 @@ let editMember (m : EditMember) (typs : (string * LocalizedString) seq) ctx vi =
   form [ _action "/small-group/member/save"; _method "post"; _class "pt-center-columns" ] [
     style [ _scoped ] [ rawText "#memberName { width: 15rem; } #emailAddress { width: 20rem; }" ]
     csrfToken ctx
-    input [ _type "hidden"; _name "memberId"; _value (m.memberId.ToString "N") ]
+    input [ _type "hidden"; _name "memberId"; _value (flatGuid m.memberId) ]
     div [ _class "pt-field-row" ] [
       div [ _class "pt-field" ] [
-        label [ _for "memberName" ] [ encLocText s.["Member Name"] ]
+        label [ _for "memberName" ] [ locStr s.["Member Name"] ]
         input [ _type "text"; _name "memberName"; _id "memberName"; _required; _autofocus; _value m.memberName ]
         ]
       div [ _class "pt-field" ] [
-        label [ _for "emailAddress" ] [ encLocText s.["E-mail Address"] ]
+        label [ _for "emailAddress" ] [ locStr s.["E-mail Address"] ]
         input [ _type "email"; _name "emailAddress"; _id "emailAddress"; _required; _value m.emailAddress ]
         ]
       ]
     div [ _class "pt-field-row" ] [
       div [ _class "pt-field" ] [
-        label [ _for "emailType" ] [ encLocText s.["E-mail Format"] ]
+        label [ _for "emailType" ] [ locStr s.["E-mail Format"] ]
         typs
         |> Seq.map (fun typ -> fst typ, (snd typ).Value)
         |> selectList "emailType" m.emailType []
@@ -141,28 +141,28 @@ let logOn (grps : SmallGroup list) grpId ctx vi =
       csrfToken ctx
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [ _for "smallGroupId" ] [ encLocText s.["Group"] ]
+          label [ _for "smallGroupId" ] [ locStr s.["Group"] ]
           seq {
             match grps.Length with
             | 0 -> yield "", s.["There are no classes with passwords defined"].Value
             | _ ->
                 yield "", selectDefault s.["Select Group"].Value
                 yield! grps
-                  |> List.map (fun grp -> grp.smallGroupId.ToString "N", sprintf "%s | %s" grp.church.name grp.name)
+                  |> List.map (fun grp -> flatGuid grp.smallGroupId, sprintf "%s | %s" grp.church.name grp.name)
             }
           |> selectList "smallGroupId" grpId [ _required ]
           ]
         div [ _class "pt-field" ] [
-          label [ _for "password" ] [ encLocText s.["Password"] ]
+          label [ _for "password" ] [ locStr s.["Password"] ]
           input [ _type "password"; _name "password"; _id "password"; _required;
                   _placeholder (s.["Case-Sensitive"].Value.ToLower ()) ]
           ]
         ]
       div [ _class "pt-checkbox-field" ] [
         input [ _type "checkbox"; _name "rememberMe"; _id "rememberMe"; _value "True" ]
-        label [ _for "rememberMe" ] [ encLocText s.["Remember Me"] ]
+        label [ _for "rememberMe" ] [ locStr s.["Remember Me"] ]
         br []
-        small [] [ em [] [ encodedText (s.["Requires Cookies"].Value.ToLower ()) ] ]
+        small [] [ em [] [ str (s.["Requires Cookies"].Value.ToLower ()) ] ]
         ]
       div [ _class "pt-field-row" ] [ submit [] "account_circle" s.["Log On"] ]
       ]
@@ -174,47 +174,52 @@ let logOn (grps : SmallGroup list) grpId ctx vi =
 
 /// View for the small group maintenance page
 let maintain (grps : SmallGroup list) ctx vi =
-  let s = I18N.localizer.Force ()
+  let s      = I18N.localizer.Force ()
+  let grpTbl =
+    match grps with
+    | [] -> space
+    | _ ->
+        table [ _class "pt-table pt-action-table" ] [
+          thead [] [
+            tr [] [
+              th [] [ locStr s.["Actions"] ]
+              th [] [ locStr s.["Name"] ]
+              th [] [ locStr s.["Church"] ]
+              th [] [ locStr s.["Time Zone"] ]
+              ]
+            ]
+          grps
+          |> List.map (fun g ->
+              let grpId     = flatGuid g.smallGroupId
+              let delAction = sprintf "/small-group/%s/delete" grpId
+              let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
+                                   sprintf "%s (%s)" (s.["Small Group"].Value.ToLower ()) g.name].Value
+              tr [] [
+                td [] [
+                  a [ _href (sprintf "/small-group/%s/edit" grpId); _title s.["Edit This Group"].Value ] [ icon "edit" ]
+                  a [ _href delAction
+                      _title s.["Delete This Group"].Value
+                      _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
+                    [ icon "delete_forever" ]
+                  ]
+                td [] [ str g.name ]
+                td [] [ str g.church.name ]
+                td [] [ locStr (TimeZones.name g.preferences.timeZoneId s) ]
+                ])
+          |> tbody []
+          ]
   [ div [ _class "pt-center-text" ] [
       br []
       a [ _href (sprintf "/small-group/%s/edit" emptyGuid); _title s.["Add a New Group"].Value ] [
         icon "add_circle"
         rawText "  "
-        encLocText s.["Add a New Group"]
+        locStr s.["Add a New Group"]
         ]
       br []
       br []
       ]
     tableSummary grps.Length s
-    table [ _class "pt-table pt-action-table" ] [
+    grpTbl
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["Church"] ]
-          th [] [ encLocText s.["Time Zone"] ]
-          ]
-        ]
-      grps
-      |> List.map (fun g ->
-          let grpId     = g.smallGroupId.ToString "N"
-          let delAction = sprintf "/small-group/%s/delete" grpId
-          let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
-                               sprintf "%s (%s)" (s.["Small Group"].Value.ToLower ()) g.name].Value
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/small-group/%s/edit" grpId); _title s.["Edit This Group"].Value ] [ icon "edit" ]
-              a [ _href delAction
-                  _title s.["Delete This Group"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText g.name ]
-            td [] [ encodedText g.church.name ]
-            td [] [ encLocText (TimeZones.name g.preferences.timeZoneId s) ]
-            ])
-      |> tbody []
-      ]
     form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
     ]
   |> Layout.Content.standard
@@ -223,45 +228,50 @@ let maintain (grps : SmallGroup list) ctx vi =
 
 /// View for the member maintenance page
 let members (mbrs : Member list) (emailTyps : Map<string, LocalizedString>) ctx vi =
-  let s = I18N.localizer.Force ()
+  let s      = I18N.localizer.Force ()
+  let mbrTbl =
+    match mbrs with
+    | [] -> space
+    | _ ->
+        table [ _class "pt-table pt-action-table" ] [
+          thead [] [
+            tr [] [
+              th [] [ locStr s.["Actions"] ]
+              th [] [ locStr s.["Name"] ]
+              th [] [ locStr s.["E-mail Address"] ]
+              th [] [ locStr s.["Format"] ]
+              ]
+            ]
+          mbrs
+          |> List.map (fun mbr ->
+              let mbrId     = flatGuid mbr.memberId
+              let delAction = sprintf "/small-group/member/%s/delete" mbrId
+              let delPrompt = s.["Are you want to delete this {0} ({1})?  This action cannot be undone.",
+                                  s.["group member"], mbr.memberName].Value
+              tr [] [
+                td [] [
+                  a [ _href (sprintf "/small-group/member/%s/edit" mbrId); _title s.["Edit This Group Member"].Value ]
+                    [ icon "edit" ]
+                  a [ _href delAction
+                      _title s.["Delete This Group Member"].Value
+                      _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
+                    [ icon "delete_forever" ]
+                  ]
+                td [] [ str mbr.memberName ]
+                td [] [ str mbr.email ]
+                td [] [ locStr emailTyps.[defaultArg mbr.format ""] ]
+                ])
+          |> tbody []
+          ]
   [ div [ _class"pt-center-text" ] [
       br []
       a [ _href (sprintf "/small-group/member/%s/edit" emptyGuid); _title s.["Add a New Group Member"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New Group Member"] ]
+        [ icon "add_circle"; rawText " &nbsp;"; locStr s.["Add a New Group Member"] ]
       br []
       br []
       ]
     tableSummary mbrs.Length s
-    table [ _class "pt-table pt-action-table" ] [
+    mbrTbl
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["E-mail Address"] ]
-          th [] [ encLocText s.["Format"] ]
-          ]
-        ]
-      mbrs
-      |> List.map (fun mbr ->
-          let mbrId = mbr.memberId.ToString "N"
-          let delAction = sprintf "/small-group/member/%s/delete" mbrId
-          let delPrompt = s.["Are you want to delete this {0} ({1})?  This action cannot be undone.",
-                              s.["group member"], mbr.memberName].Value
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/small-group/member/%s/edit" mbrId); _title s.["Edit This Group Member"].Value ]
-                [ icon "edit" ]
-              a [ _href delAction
-                  _title s.["Delete This Group Member"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText mbr.memberName ]
-            td [] [ encodedText mbr.email ]
-            td [] [ encLocText emailTyps.[defaultArg mbr.format ""] ]
-            ])
-      |> tbody []
-      ]
     form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
     ]
   |> Layout.Content.standard
@@ -277,52 +287,52 @@ let overview m vi =
     section [] [
       header [ _role "heading" ] [
         iconSized 72 "bookmark_border"
-        encLocText s.["Quick Actions"]
+        locStr s.["Quick Actions"]
         ]
       div [] [
-        a [ _href "/prayer-requests/view" ] [ icon "list"; linkSpacer; encLocText s.["View Prayer Request List"] ]
+        a [ _href "/prayer-requests/view" ] [ icon "list"; linkSpacer; locStr s.["View Prayer Request List"] ]
         hr []
-        a [ _href "/small-group/announcement" ] [ icon "send"; linkSpacer; encLocText s.["Send Announcement"] ]
+        a [ _href "/small-group/announcement" ] [ icon "send"; linkSpacer; locStr s.["Send Announcement"] ]
         hr []
-        a [ _href "/small-group/preferences" ] [ icon "build"; linkSpacer; encLocText s.["Change Preferences"] ]
+        a [ _href "/small-group/preferences" ] [ icon "build"; linkSpacer; locStr s.["Change Preferences"] ]
         ]
       ]
     section [] [
       header [ _role "heading" ] [
         iconSized 72 "question_answer"
-        encLocText s.["Prayer Requests"]
+        locStr s.["Prayer Requests"]
         ]
       div [] [
         yield p [ _class "pt-center-text" ] [
-          strong [] [ encodedText (m.totalActiveReqs.ToString "N0"); space; encLocText s.["Active Requests"] ]
+          strong [] [ str (m.totalActiveReqs.ToString "N0"); space; locStr s.["Active Requests"] ]
           ]
         yield hr []
         for cat in m.activeReqsByCat do
-          yield encodedText (cat.Value.ToString "N0")
+          yield str (cat.Value.ToString "N0")
           yield space
-          yield encLocText typs.[cat.Key]
+          yield locStr typs.[cat.Key]
           yield br []
         yield br []
-        yield encodedText (m.allReqs.ToString "N0")
+        yield str (m.allReqs.ToString "N0")
         yield space
-        yield encLocText s.["Total Requests"]
+        yield locStr s.["Total Requests"]
         yield hr []
         yield a [ _href "/prayer-requests/maintain" ] [
           icon "compare_arrows"
           linkSpacer
-          encLocText s.["Maintain Prayer Requests"]
+          locStr s.["Maintain Prayer Requests"]
           ]
         ]
       ]
     section [] [
       header [ _role "heading" ] [
         iconSized 72 "people_outline"
-        encLocText s.["Group Members"]
+        locStr s.["Group Members"]
         ]
       div [ _class "pt-center-text" ] [
-        strong [] [ encodedText (m.totalMbrs.ToString "N0"); space; encLocText s.["Members"] ]
+        strong [] [ str (m.totalMbrs.ToString "N0"); space; locStr s.["Members"] ]
         hr []
-        a [ _href "/small-group/members" ] [ icon "email"; linkSpacer; encLocText s.["Maintain Group Members"] ]
+        a [ _href "/small-group/members" ] [ icon "email"; linkSpacer; locStr s.["Maintain Group Members"] ]
         ]
       ]
     ]
@@ -341,58 +351,58 @@ let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
       style [ _scoped ] [ rawText "#expireDays, #daysToKeepNew, #longTermUpdateWeeks, #headingFontSize, #listFontSize { width: 3rem; } #emailFromAddress { width: 20rem; } #listFonts { width: 40rem; } @media screen and (max-width: 40rem) { #listFonts { width: 100%; } }" ]
       csrfToken ctx
       fieldset [] [
-        legend [] [ strong [] [ icon "date_range"; rawText " &nbsp;"; encLocText s.["Dates"] ] ]
+        legend [] [ strong [] [ icon "date_range"; rawText " &nbsp;"; locStr s.["Dates"] ] ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _for "expireDays" ] [ encLocText s.["Requests Expire After"] ]
+            label [ _for "expireDays" ] [ locStr s.["Requests Expire After"] ]
             span [] [
               input [ _type "number"; _name "expireDays"; _id "expireDays"; _min "1"; _max "30"; _required; _autofocus
                       _value (string m.expireDays) ]
-              space; encodedText (s.["Days"].Value.ToLower ())
+              space; str (s.["Days"].Value.ToLower ())
               ]
             ]
           div [ _class "pt-field" ] [
-            label [ _for "daysToKeepNew" ] [ encLocText s.["Requests “New” For"] ]
+            label [ _for "daysToKeepNew" ] [ locStr s.["Requests “New” For"] ]
             span [] [
               input [ _type "number"; _name "daysToKeepNew"; _id "daysToKeepNew"; _min "1"; _max "30"; _required
                       _value (string m.daysToKeepNew) ]
-              space; encodedText (s.["Days"].Value.ToLower ())
+              space; str (s.["Days"].Value.ToLower ())
               ]
             ]
           div [ _class "pt-field" ] [
-            label [ _for "longTermUpdateWeeks" ] [ encLocText s.["Long-Term Requests Alerted for Update"] ]
+            label [ _for "longTermUpdateWeeks" ] [ locStr s.["Long-Term Requests Alerted for Update"] ]
             span [] [
               input [ _type "number"; _name "longTermUpdateWeeks"; _id "longTermUpdateWeeks"; _min "1"; _max "30"
                       _required; _value (string m.longTermUpdateWeeks) ]
-              space; encodedText (s.["Weeks"].Value.ToLower ())
+              space; str (s.["Weeks"].Value.ToLower ())
               ]
             ]
           ]
         ]
       fieldset [] [
-        legend [] [ strong [] [ icon "sort"; rawText " &nbsp;"; encLocText s.["Request Sorting"] ] ]
+        legend [] [ strong [] [ icon "sort"; rawText " &nbsp;"; locStr s.["Request Sorting"] ] ]
         radio "requestSort" "requestSort_D" "D" m.requestSort
-        label [ _for "requestSort_D" ] [ encLocText s.["Sort by Last Updated Date"] ]
+        label [ _for "requestSort_D" ] [ locStr s.["Sort by Last Updated Date"] ]
         rawText " &nbsp; "
         radio "requestSort" "requestSort_R" "R" m.requestSort
-        label [ _for "requestSort_R" ] [ encLocText s.["Sort by Requestor Name"] ]
+        label [ _for "requestSort_R" ] [ locStr s.["Sort by Requestor Name"] ]
         ]
       fieldset [] [
-        legend [] [ strong [] [ icon "mail_outline"; rawText " &nbsp;"; encLocText s.["E-mail"] ] ]
+        legend [] [ strong [] [ icon "mail_outline"; rawText " &nbsp;"; locStr s.["E-mail"] ] ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _for "emailFromName" ] [ encLocText s.["From Name"] ]
+            label [ _for "emailFromName" ] [ locStr s.["From Name"] ]
             input [ _type "text"; _name "emailFromName"; _id "emailFromName"; _required; _value m.emailFromName ]
             ]
           div [ _class "pt-field" ] [
-            label [ _for "emailFromAddress" ] [ encLocText s.["From Address"] ]
+            label [ _for "emailFromAddress" ] [ locStr s.["From Address"] ]
             input [ _type "email"; _name "emailFromAddress"; _id "emailFromAddress"; _required
                     _value m.emailFromAddress ]
             ]
           ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _for "defaultEmailType" ] [ encLocText s.["E-mail Format"] ]
+            label [ _for "defaultEmailType" ] [ locStr s.["E-mail Format"] ]
             seq {
               yield "", selectDefault s.["Select"].Value
               yield! ReferenceList.emailTypeList "" s |> Seq.skip 1 |> Seq.map (fun typ -> fst typ, (snd typ).Value)
@@ -402,19 +412,19 @@ let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
           ]
         ]
       fieldset [] [
-        legend [] [ strong [] [ icon "color_lens"; rawText " &nbsp;"; encLocText s.["Colors"] ]; rawText " ***" ]
+        legend [] [ strong [] [ icon "color_lens"; rawText " &nbsp;"; locStr s.["Colors"] ]; rawText " ***" ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _class "pt-center-text" ] [ encLocText s.["Color of Heading Lines"] ]
+            label [ _class "pt-center-text" ] [ locStr s.["Color of Heading Lines"] ]
             span [] [
               radio "headingLineType" "headingLineType_Name" "Name" m.headingLineType
-              label [ _for "headingLineType_Name" ] [ encLocText s.["Named Color"] ]
+              label [ _for "headingLineType_Name" ] [ locStr s.["Named Color"] ]
               namedColorList "headingLineColor" m.headingLineColor
                 [ yield _id "headingLineColor_Select"
                   match m.headingLineColor.StartsWith "#" with true -> yield _disabled | false -> () ] s
-              rawText "&nbsp; &nbsp; "; encodedText (s.["or"].Value.ToUpper ())
+              rawText "&nbsp; &nbsp; "; str (s.["or"].Value.ToUpper ())
               radio "headingLineType" "headingLineType_RGB" "RGB" m.headingLineType
-              label [ _for "headingLineType_RGB" ] [ encLocText s.["Custom Color"] ]
+              label [ _for "headingLineType_RGB" ] [ locStr s.["Custom Color"] ]
               input [ yield _type "color" 
                       yield _name "headingLineColor"
                       yield _id "headingLineColor_Color"
@@ -425,16 +435,16 @@ let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
           ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _class "pt-center-text" ] [ encLocText s.["Color of Heading Text"] ]
+            label [ _class "pt-center-text" ] [ locStr s.["Color of Heading Text"] ]
             span [] [
               radio "headingTextType" "headingTextType_Name" "Name" m.headingTextType
-              label [ _for "headingTextType_Name" ] [ encLocText s.["Named Color"] ]
+              label [ _for "headingTextType_Name" ] [ locStr s.["Named Color"] ]
               namedColorList "headingTextColor" m.headingTextColor
                 [ yield _id "headingTextColor_Select"
                   match m.headingTextColor.StartsWith "#" with true -> yield _disabled | false -> () ] s
-              rawText "&nbsp; &nbsp; "; encodedText (s.["or"].Value.ToUpper ())
+              rawText "&nbsp; &nbsp; "; str (s.["or"].Value.ToUpper ())
               radio "headingTextType" "headingTextType_RGB" "RGB" m.headingTextType
-              label [ _for "headingTextType_RGB" ] [ encLocText s.["Custom Color"] ]
+              label [ _for "headingTextType_RGB" ] [ locStr s.["Custom Color"] ]
               input [ yield _type "color"
                       yield _name "headingTextColor"
                       yield _id "headingTextColor_Color"
@@ -445,29 +455,29 @@ let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
           ]
         ]
       fieldset [] [
-        legend [] [ strong [] [ icon "font_download"; rawText " &nbsp;"; encLocText s.["Fonts"] ] ]
+        legend [] [ strong [] [ icon "font_download"; rawText " &nbsp;"; locStr s.["Fonts"] ] ]
         div [ _class "pt-field" ] [
-          label [ _for "listFonts" ] [ encLocText s.["Fonts** for List"] ]
+          label [ _for "listFonts" ] [ locStr s.["Fonts** for List"] ]
           input [ _type "text"; _name "listFonts"; _id "listFonts"; _required; _value m.listFonts ]
           ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _for "headingFontSize" ] [ encLocText s.["Heading Text Size"] ]
+            label [ _for "headingFontSize" ] [ locStr s.["Heading Text Size"] ]
             input [ _type "number"; _name "headingFontSize"; _id "headingFontSize"; _min "8"; _max "24"; _required
                     _value (string m.headingFontSize) ]
             ]
           div [ _class "pt-field" ] [
-            label [ _for "listFontSize" ] [ encLocText s.["List Text Size"] ]
+            label [ _for "listFontSize" ] [ locStr s.["List Text Size"] ]
             input [ _type "number"; _name "listFontSize"; _id "listFontSize"; _min "8"; _max "24"; _required
                     _value (string m.listFontSize) ]
             ]
           ]
         ]
       fieldset [] [
-        legend [] [ strong [] [ icon "settings"; rawText " &nbsp;"; encLocText s.["Other Settings"] ] ]
+        legend [] [ strong [] [ icon "settings"; rawText " &nbsp;"; locStr s.["Other Settings"] ] ]
         div [ _class "pt-field-row" ] [
           div [ _class "pt-field" ] [
-            label [ _for "TimeZone" ] [ encLocText s.["Time Zone"] ]
+            label [ _for "TimeZone" ] [ locStr s.["Time Zone"] ]
             seq {
               yield "", selectDefault s.["Select"].Value
               yield! tzs |> List.map (fun tz -> tz.timeZoneId, (TimeZones.name tz.timeZoneId s).Value)
@@ -476,16 +486,16 @@ let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
             ]
           ]
         div [ _class "pt-field" ] [
-          label [] [ encLocText s.["Request List Visibility"] ]
+          label [] [ locStr s.["Request List Visibility"] ]
           span [] [
             radio "listVisibility" "viz_Public" (string RequestVisibility.``public``) (string m.listVisibility)
-            label [ _for "viz_Public" ] [ encLocText s.["Public"] ]
+            label [ _for "viz_Public" ] [ locStr s.["Public"] ]
             rawText " &nbsp;"
             radio "listVisibility" "viz_Private" (string RequestVisibility.``private``) (string m.listVisibility)
-            label [ _for "viz_Private" ] [ encLocText s.["Private"] ]
+            label [ _for "viz_Private" ] [ locStr s.["Private"] ]
             rawText " &nbsp;"
             radio "listVisibility" "viz_Password" (string RequestVisibility.passwordProtected) (string m.listVisibility)
-            label [ _for "viz_Password" ] [ encLocText s.["Password Protected"] ]
+            label [ _for "viz_Password" ] [ locStr s.["Password Protected"] ]
             ]
           ]
         div [ yield _id "divClassPassword"
@@ -494,7 +504,7 @@ let preferences (m : EditPreferences) (tzs : TimeZone list) ctx vi =
               | false -> yield _class "pt-field-row pt-fadeable"
               ] [
           div [ _class "pt-field" ] [
-            label [ _for "groupPassword" ] [ encLocText s.["Group Password (Used to Read Online)"] ]
+            label [ _for "groupPassword" ] [ locStr s.["Group Password (Used to Read Online)"] ]
             input [ _type "text"; _name "groupPassword"; _id "groupPassword";
                     _value (match m.groupPassword with Some x -> x | None -> "") ]
             ]

src/PrayerTracker.UI/User.fs

@@ -5,34 +5,33 @@ open PrayerTracker.Entities
 open PrayerTracker.ViewModels
 
 /// View for the group assignment page
-let assignGroups m (groups : Map<string, string>) (curGroups : string list) ctx vi =
+let assignGroups m groups curGroups ctx vi =
   let s         = I18N.localizer.Force ()
   let pageTitle = sprintf "%s • %A" m.userName s.["Assign Groups"]
   form [ _action "/user/small-groups/save"; _method "post"; _class "pt-center-columns" ] [
     csrfToken ctx
-    input [ _type "hidden"; _name "userId"; _value (m.userId.ToString "N") ]
+    input [ _type "hidden"; _name "userId"; _value (flatGuid m.userId) ]
     input [ _type "hidden"; _name "userName"; _value m.userName ]
     table [ _class "pt-table" ] [
       thead [] [
         tr [] [
           th [] [ rawText "&nbsp;" ]
-          th [] [ encLocText s.["Group"] ]
+          th [] [ locStr s.["Group"] ]
           ]
         ]
       groups
-      |> Seq.map (fun grp ->
+      |> List.map (fun (grpId, grpName) ->
-          let inputId = sprintf "id-%s" grp.Key
+          let inputId = sprintf "id-%s" grpId
           tr [] [
             td [] [
               input [ yield _type "checkbox"
                       yield _name "smallGroups"
                       yield _id inputId
-                      yield _value grp.Key
+                      yield _value grpId
-                      match curGroups |> List.contains grp.Key with true -> yield _checked | false -> () ]
+                      match curGroups |> List.contains grpId with true -> yield _checked | false -> () ]
               ]
-            td [] [ label [ _for inputId ] [ encodedText grp.Value ] ]
+            td [] [ label [ _for inputId ] [ str grpName ] ]
             ])
-      |> List.ofSeq
       |> tbody []
       ]
     div [ _class "pt-field-row" ] [ submit [] "save" s.["Save Group Assignments"] ]
@@ -46,7 +45,7 @@ let assignGroups m (groups : Map<string, string>) (curGroups : string list) ctx
 let changePassword ctx vi =
   let s = I18N.localizer.Force ()
   [ p [ _class "pt-center-text" ] [
-      encLocText s.["To change your password, enter your current password in the specified box below, then enter your new password twice."]
+      locStr s.["To change your password, enter your current password in the specified box below, then enter your new password twice."]
       ]
     form [ _action "/user/password/change"
            _method "post"
@@ -55,13 +54,13 @@ let changePassword ctx vi =
       csrfToken ctx
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [ _for "oldPassword" ] [ encLocText s.["Current Password"] ]
+          label [ _for "oldPassword" ] [ locStr s.["Current Password"] ]
           input [ _type "password"; _name "oldPassword"; _id "oldPassword"; _required; _autofocus ]
           ]
         ]
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [ _for "newPassword" ] [ encLocText s.["New Password Twice"] ]
+          label [ _for "newPassword" ] [ locStr s.["New Password Twice"] ]
           input [ _type "password"; _name "newPassword"; _id "newPassword"; _required ]
           ]
         div [ _class "pt-field" ] [
@@ -89,28 +88,28 @@ let edit (m : EditUser) ctx vi =
       style [ _scoped ]
         [ rawText "#firstName, #lastName, #password, #passwordConfirm { width: 10rem; } #emailAddress { width: 20rem; } " ]
       csrfToken ctx
-      input [ _type "hidden"; _name "userId"; _value (m.userId.ToString "N") ]
+      input [ _type "hidden"; _name "userId"; _value (flatGuid m.userId) ]
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [ _for "firstName" ] [ encLocText s.["First Name"] ]
+          label [ _for "firstName" ] [ locStr s.["First Name"] ]
           input [ _type "text"; _name "firstName"; _id "firstName"; _value m.firstName; _required; _autofocus ]
           ]
         div [ _class "pt-field" ] [
-          label [ _for "lastName" ] [ encLocText s.["Last Name"] ]
+          label [ _for "lastName" ] [ locStr s.["Last Name"] ]
           input [ _type "text"; _name "lastName"; _id "lastName"; _value m.lastName; _required ]
           ]
         div [ _class "pt-field" ] [
-          label [ _for "emailAddress" ] [ encLocText s.["E-mail Address"] ]
+          label [ _for "emailAddress" ] [ locStr s.["E-mail Address"] ]
           input [ _type "email"; _name "emailAddress"; _id "emailAddress"; _value m.emailAddress; _required ]
           ]
         ]
       div [ _class "pt-field-row" ] [
         div [ _class "pt-field" ] [
-          label [ _for "password" ] [ encLocText s.["Password"] ]
+          label [ _for "password" ] [ locStr s.["Password"] ]
           input [ _type "password"; _name "password"; _id "password"; _placeholder pwPlaceholder ]
           ]
         div [ _class "pt-field" ] [
-          label [ _for "passwordConfirm" ] [ encLocText s.["Password Again"] ]
+          label [ _for "passwordConfirm" ] [ locStr s.["Password Again"] ]
           input [ _type "password"; _name "passwordConfirm"; _id "passwordConfirm"; _placeholder pwPlaceholder ]
           ]
         ]
@@ -120,7 +119,7 @@ let edit (m : EditUser) ctx vi =
                 yield _id "isAdmin"
                 yield _value "True"
                 match m.isAdmin with Some x when x -> yield _checked | _ -> () ]
-        label [ _for "isAdmin" ] [ encLocText s.["This user is a PrayerTracker administrator"] ]
+        label [ _for "isAdmin" ] [ locStr s.["This user is a PrayerTracker administrator"] ]
         ]
       div [ _class "pt-field-row" ] [ submit [] "save" s.["Save User"] ]
       ]
@@ -131,7 +130,7 @@ let edit (m : EditUser) ctx vi =
 
 
 /// View for the user log on page
-let logOn (m : UserLogOn) (groups : Map<string, string>) ctx vi =
+let logOn (m : UserLogOn) groups ctx vi =
   let s = I18N.localizer.Force ()
   form [ _action "/user/log-on"; _method "post"; _class "pt-center-columns" ] [
     style [ _scoped ] [ rawText "#emailAddress { width: 20rem; }" ]
@@ -139,21 +138,21 @@ let logOn (m : UserLogOn) (groups : Map<string, string>) ctx vi =
     input [ _type "hidden"; _name "redirectUrl"; _value (defaultArg m.redirectUrl "") ]
     div [ _class "pt-field-row" ] [
       div [ _class "pt-field" ] [
-        label [ _for "emailAddress"] [ encLocText s.["E-mail Address"] ]
+        label [ _for "emailAddress"] [ locStr s.["E-mail Address"] ]
         input [ _type "email"; _name "emailAddress"; _id "emailAddress"; _value m.emailAddress; _required; _autofocus ]
         ]
       div [ _class "pt-field" ] [
-        label [ _for "password" ] [ encLocText s.["Password"] ]
+        label [ _for "password" ] [ locStr s.["Password"] ]
         input [ _type "password"; _name "password"; _id "password"; _required;
                 _placeholder (sprintf "(%s)" (s.["Case-Sensitive"].Value.ToLower ())) ]
         ]
       ]
     div [ _class "pt-field-row" ] [
       div [ _class "pt-field" ] [
-        label [ _for "smallGroupId" ] [ encLocText s.["Group"] ]
+        label [ _for "smallGroupId" ] [ locStr s.["Group"] ]
         seq {
           yield "", selectDefault s.["Select Group"].Value
-          yield! groups |> Seq.sortBy (fun x -> x.Value) |> Seq.map (fun x -> x.Key, x.Value)
+          yield! groups
           }
         |> selectList "smallGroupId" "" [ _required ]
                
@@ -161,9 +160,9 @@ let logOn (m : UserLogOn) (groups : Map<string, string>) ctx vi =
       ]
     div [ _class "pt-checkbox-field" ] [
       input [ _type "checkbox"; _name "rememberMe"; _id "rememberMe"; _value "True" ]
-      label [ _for "rememberMe" ] [ encLocText s.["Remember Me"] ]
+      label [ _for "rememberMe" ] [ locStr s.["Remember Me"] ]
       br []
-      small [] [ em [] [ rawText "("; encodedText (s.["Requires Cookies"].Value.ToLower ()); rawText ")" ] ]
+      small [] [ em [] [ rawText "("; str (s.["Requires Cookies"].Value.ToLower ()); rawText ")" ] ]
       ]
     div [ _class "pt-field-row" ] [ submit [] "account_circle" s.["Log On"] ]
     ]
@@ -174,48 +173,53 @@ let logOn (m : UserLogOn) (groups : Map<string, string>) ctx vi =
 
 /// View for the user maintenance page
 let maintain (users : User list) ctx vi =
-  let s = I18N.localizer.Force ()
+  let s      = I18N.localizer.Force ()
+  let usrTbl =
+    match users with
+    | [] -> space
+    | _ ->
+        table [ _class "pt-table pt-action-table" ] [
+          thead [] [
+            tr [] [
+              th [] [ locStr s.["Actions"] ]
+              th [] [ locStr s.["Name"] ]
+              th [] [ locStr s.["Admin?"] ]
+              ]
+            ]
+          users
+          |> List.map (fun user ->
+              let userId    = flatGuid user.userId
+              let delAction = sprintf "/user/%s/delete" userId
+              let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
+                                  (sprintf "%s (%s)" (s.["User"].Value.ToLower()) user.fullName)].Value
+              tr [] [
+                td [] [
+                  a [ _href (sprintf "/user/%s/edit" userId); _title s.["Edit This User"].Value ] [ icon "edit" ]
+                  a [ _href (sprintf "/user/%s/small-groups" userId); _title s.["Assign Groups to This User"].Value ]
+                    [ icon "group" ]
+                  a [ _href delAction
+                      _title s.["Delete This User"].Value
+                      _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
+                    [ icon "delete_forever" ]
+                  ]
+                td [] [ str user.fullName ]
+                td [ _class "pt-center-text" ] [
+                  match user.isAdmin with
+                  | true -> yield strong [] [ locStr s.["Yes"] ]
+                  | false -> yield locStr s.["No"]
+                  ]
+                ])
+          |> tbody []
+          ]
   [ div [ _class "pt-center-text" ] [
       br []
       a [ _href (sprintf "/user/%s/edit" emptyGuid); _title s.["Add a New User"].Value ]
-        [ icon "add_circle"; rawText " &nbsp;"; encLocText s.["Add a New User"] ]
+        [ icon "add_circle"; rawText " &nbsp;"; locStr s.["Add a New User"] ]
       br []
       br []
       ]
     tableSummary users.Length s
-    table [ _class "pt-table pt-action-table" ] [
+    usrTbl
-      thead [] [
-        tr [] [
-          th [] [ encLocText s.["Actions"] ]
-          th [] [ encLocText s.["Name"] ]
-          th [] [ encLocText s.["Admin?"] ]
-          ]
-        ]
-      users
-      |> List.map (fun user ->
-          let userId    = user.userId.ToString "N"
-          let delAction = sprintf "/user/%s/delete" userId
-          let delPrompt = s.["Are you want to delete this {0}?  This action cannot be undone.",
-                              (sprintf "%s (%s)" (s.["User"].Value.ToLower()) user.fullName)].Value
-          tr [] [
-            td [] [
-              a [ _href (sprintf "/user/%s/edit" userId); _title s.["Edit This User"].Value ] [ icon "edit" ]
-              a [ _href (sprintf "/user/%s/small-groups" userId); _title s.["Assign Groups to This User"].Value ]
-                [ icon "group" ]
-              a [ _href delAction
-                  _title s.["Delete This User"].Value
-                  _onclick (sprintf "return PT.confirmDelete('%s','%s')" delAction delPrompt) ]
-                [ icon "delete_forever" ]
-              ]
-            td [] [ encodedText user.fullName ]
-            td [ _class "pt-center-text" ] [
-              match user.isAdmin with
-              | true -> yield strong [] [ encLocText s.["Yes"] ]
-              | false -> yield encLocText s.["No"]
-              ]
-            ])
-      |> tbody []
-      ]
     form [ _id "DeleteForm"; _action ""; _method "post" ] [ csrfToken ctx ]
     ]
   |> Layout.Content.standard

src/PrayerTracker.UI/Utils.fs

@@ -10,29 +10,39 @@ open System
 /// Hash a string with a SHA1 hash
 let sha1Hash (x : string) =
   use alg = SHA1.Create ()
-  alg.ComputeHash (ASCIIEncoding().GetBytes x)
+  alg.ComputeHash (Encoding.ASCII.GetBytes x)
   |> Seq.map (fun chr -> chr.ToString "x2")
-  |> Seq.reduce (+)
+  |> String.concat ""
 
 
 /// Hash a string using 1,024 rounds of PBKDF2 and a salt
 let pbkdf2Hash (salt : Guid) (x : string) =
   use alg = new Rfc2898DeriveBytes (x, Encoding.UTF8.GetBytes (salt.ToString "N"), 1024)
-  Convert.ToBase64String(alg.GetBytes 64)
+  (alg.GetBytes >> Convert.ToBase64String) 64
 
 
-/// Replace the first occurrence of a string with a second string within a given string
+/// String helper functions
-let replaceFirst (needle : string) replacement (haystack : string) =
+module String =
-  let i = haystack.IndexOf needle
+  
-  match i with
+  /// string.Trim()
-  | -1 -> haystack
+  let trim (str: string) = str.Trim ()
-  | _ ->
+
-      seq {
+  /// string.Replace()
-        yield haystack.Substring (0, i)
+  let replace (find : string) repl (str : string) = str.Replace (find, repl)
-        yield replacement
+
-        yield haystack.Substring (i + needle.Length)
+
-        }
+  /// Replace the first occurrence of a string with a second string within a given string
-      |> Seq.reduce (+)
+  let replaceFirst (needle : string) replacement (haystack : string) =
+    match haystack.IndexOf needle with
+    | -1 -> haystack
+    | idx ->
+        seq {
+          yield haystack.[0..idx - 1]
+          yield replacement
+          yield haystack.[idx + needle.Length..]
+          }
+        |> String.concat ""
+
 
 /// Strip HTML tags from the given string
 // Adapted from http://www.dijksterhuis.org/safely-cleaning-html-with-strip_tags-in-csharp/
@@ -51,21 +61,15 @@ let stripTags allowedTags input =
                 || htmlTag.IndexOf (sprintf "</%s" t) = 0) false
     match isAllowed with
     | true -> ()
-    | false -> output <- replaceFirst tag.Value "" output
+    | false -> output <- String.replaceFirst tag.Value "" output
   output
 
+
 /// Wrap a string at the specified number of characters
 let wordWrap charPerLine (input : string) =
   match input.Length with
   | len when len <= charPerLine -> input
   | _ ->
-      let rec findSpace (inp : string) idx =
-        match idx with
-        | 0 -> 0
-        | _ ->
-            match inp.Substring (idx, 1) with
-            | null | " " -> idx
-            | _ -> findSpace inp (idx - 1)
       seq {
         for line in input.Replace("\r", "").Split '\n' do
           let mutable remaining = line
@@ -73,41 +77,52 @@ let wordWrap charPerLine (input : string) =
           | 0 -> ()
           | _ ->
               while charPerLine < remaining.Length do
-                let spaceIdx = findSpace remaining charPerLine
+                match charPerLine + 1 < remaining.Length && remaining.[charPerLine] = ' ' with
-                match spaceIdx with
+                | true ->
-                | 0 ->
+                    // Line length is followed by a space; return [charPerLine] as a line
-                    // No whitespace; just break it at [characters]
+                    yield remaining.[0..charPerLine - 1]
-                    yield remaining.Substring (0, charPerLine)
+                    remaining <- remaining.[charPerLine + 1..]
-                    remaining <- remaining.Substring charPerLine
+                | false ->
-                | _ ->
+                    match remaining.[0..charPerLine - 1].LastIndexOf ' ' with
-                    yield remaining.Substring (0, spaceIdx)
+                    | -1 ->
-                    remaining <- remaining.Substring (spaceIdx + 1)
+                        // No whitespace; just break it at [characters]
-              match remaining.Length with
+                        yield remaining.[0..charPerLine - 1]
-              | 0 -> ()
+                        remaining <- remaining.[charPerLine..]
-              | _ -> yield remaining
+                    | spaceIdx ->
+                        // Break on the last space in the line
+                        yield remaining.[0..spaceIdx - 1]
+                        remaining <- remaining.[spaceIdx + 1..]
+              // Leftovers - yum!
+              match remaining.Length with 0 -> () | _ -> yield remaining
         }
       |> Seq.fold (fun (acc : StringBuilder) line -> acc.AppendFormat ("{0}\n", line)) (StringBuilder ())
       |> string
 
 /// Modify the text returned by CKEditor into the format we need for request and announcement text
 let ckEditorToText (text : string) =
-  text
+  let trim (str : string) = str.Trim ()
-    .Replace("\n\t", "") // \r
+  [ "\n\t",    ""
-    .Replace("&nbsp;", " ")
+    "&nbsp;",  " "
-    .Replace("  ", "&#xa0; ")
+    "  ",      "&#xa0; "
-    .Replace("</p><p>", "<br><br>") // \r
+    "</p><p>", "<br><br>"
-    .Replace("</p>", "")
+    "</p>",    ""
-    .Replace("<p>", "")
+    "<p>",     ""
-    .Trim()
+    ]
-        
+  |> List.fold (fun (txt : string) (x, y) -> String.replace x y txt) text
+  |> trim
+
 
 /// Convert an HTML piece of text to plain text
 let htmlToPlainText html =
   match html with
   | null | "" -> ""
   | _ ->
-      WebUtility.HtmlDecode((html.Trim() |> stripTags [ "br" ]).Replace("<br />", "\n").Replace("<br>", "\n"))
+      html.Trim ()
-        .Replace("\u00a0", " ")
+      |> stripTags [ "br" ]
+      |> String.replace "<br />" "\n"
+      |> String.replace "<br>" "\n"
+      |> WebUtility.HtmlDecode
+      |> String.replace "\u00a0" " "
 
 /// Get the second portion of a tuple as a string
 let sndAsString x = (snd >> string) x
@@ -154,53 +169,26 @@ module RequestVisibility =
   let ``private`` = 3
 
 
-/// A page with verbose user instructions
-type HelpPage =
-  { /// The module to which the help page applies
-    ``module`` : string
-    /// The topic for the help page
-    topic : string
-    /// The text with which this help page is linked (context help is linked with an icon)
-    linkedText : string
-    }
-  with
-    /// A help page that does not exist
-    static member None = { ``module`` = null; topic = null; linkedText = null }
-
-    /// The URL fragment for this page (appended to "/help/" for the full URL)
-    member this.Url = sprintf "%s/%s" this.``module`` this.topic
-
-
 /// Links for help locations
 module Help =
   /// Help link for small group preference edit page
-  let groupPreferences = { ``module`` = "group"; topic = "preferences"; linkedText = "Change Preferences" }
+  let groupPreferences = "small-group/preferences"
   /// Help link for send announcement page
-  let sendAnnouncement = { ``module`` = "group"; topic = "announcement"; linkedText = "Send Announcement" }
+  let sendAnnouncement = "small-group/announcement"
   /// Help link for maintain group members page
-  let maintainGroupMembers = { ``module`` = "group"; topic = "members"; linkedText = "Maintain Group Members" }
+  let maintainGroupMembers = "small-group/members"
   /// Help link for request edit page
-  let editRequest = { ``module`` = "requests"; topic = "edit"; linkedText = "Add / Edit a Request" }
+  let editRequest = "requests/edit"
   /// Help link for maintain requests page
-  let maintainRequests = { ``module`` = "requests"; topic = "maintain"; linkedText = "Maintain Requests" }
+  let maintainRequests = "requests/maintain"
   /// Help link for view request list page
-  let viewRequestList = { ``module`` = "requests"; topic = "view"; linkedText = "View Request List" }
+  let viewRequestList = "requests/view"
   /// Help link for user and class login pages
-  let logOn = { ``module`` = "user"; topic = "logon"; linkedText = "Log On" }
+  let logOn = "user/log-on"
   /// Help link for user password change page
-  let changePassword = { ``module`` = "user"; topic = "password"; linkedText = "Change Your Password" }
+  let changePassword = "user/password"
-  /// All help pages (the order is the order in which they are displayed on the main help page)
+  /// Create a full link for a help page
-  let all =
+  let fullLink lang url = sprintf "https://docs.prayer.bitbadger.solutions/%s/%s.html" lang url
-    [ logOn
-      maintainRequests
-      editRequest
-      groupPreferences
-      maintainGroupMembers
-      viewRequestList
-      sendAnnouncement
-      changePassword
-      ]
-
 
 /// This class serves as a common anchor for resources
 type Common () =

src/PrayerTracker.UI/ViewModels.fs

@@ -83,7 +83,7 @@ type AppViewInfo =
     /// JavaScript files for the page
     script       : string list
     /// The link for help on this page
-    helpLink     : HelpPage
+    helpLink     : string option
     /// Messages to be displayed to the user
     messages     : UserMessage list
     /// The current version of PrayerTracker
@@ -100,7 +100,7 @@ type AppViewInfo =
     static member fresh =
       { style        = []
         script       = []
-        helpLink     = HelpPage.None
+        helpLink     = None
         messages     = []
         version      = ""
         requestStart = DateTime.Now.Ticks
@@ -548,13 +548,13 @@ with
       | true ->
           yield div [ _style (sprintf "text-align:center;font-family:%s" prefs.listFonts) ] [
             span [ _style (sprintf "font-size:%ipt;" prefs.headingFontSize) ] [
-              strong [] [ encodedText s.["Prayer Requests"].Value ]
+              strong [] [ str s.["Prayer Requests"].Value ]
               ]
             br []
             span [ _style (sprintf "font-size:%ipt;" prefs.textFontSize) ] [
-              strong [] [ encodedText this.listGroup.name ]
+              strong [] [ str this.listGroup.name ]
               br []
-              encodedText (this.date.ToString s.["MMMM d, yyyy"].Value)
+              str (this.date.ToString s.["MMMM d, yyyy"].Value)
               ]
             ]
           yield br []
@@ -572,7 +572,7 @@ with
             tr [] [
               td [ _style (sprintf "font-size:%ipt;color:%s;padding:3px 0;border-top:solid 3px %s;border-bottom:solid 3px %s;font-weight:bold;"
                                       prefs.headingFontSize prefs.headingColor prefs.lineColor prefs.lineColor) ] [
-                rawText "    "; encodedText catName.Value; rawText "    "
+                rawText "    "; str catName.Value; rawText "    "
                 ]
               ]
             ]
@@ -585,7 +585,7 @@ with
                                       bullet prefs.listFonts prefs.textFontSize) ] [
                 match req.requestor with
                 | Some rqstr when rqstr <> "" ->
-                    yield strong [] [ encodedText rqstr ]
+                    yield strong [] [ str rqstr ]
                     yield rawText " &mdash; "
                 | Some _ -> ()
                 | None -> ()

src/PrayerTracker/App.fs

@@ -66,12 +66,8 @@ module Configure =
           route  "es"       Handlers.Church.maintain
           routef "/%O/edit" Handlers.Church.edit
           ]
-        route "/class/logon" (redirectTo true "/small-group/log-on")
+        route  "/class/logon" (redirectTo true "/small-group/log-on")
-        routef "/error/%s" Handlers.Home.error
+        routef "/error/%s"    Handlers.Home.error
-        subRoute "/help" [
-          route  ""       Handlers.Help.index
-          routef "/%s/%s" Handlers.Help.show
-          ]
         routef "/language/%s" Handlers.Home.language
         subRoute "/legal" [
           route "/privacy-policy"   Handlers.Home.privacyPolicy
@@ -161,10 +157,8 @@ module Configure =
     let log = app.ApplicationServices.GetRequiredService<ILoggerFactory>()
     (match env.IsDevelopment () with
      | true ->
-        log.AddConsole () |> ignore
         app.UseDeveloperExceptionPage ()
      | false ->
-        log.AddConsole LogLevel.Warning |> ignore
         try
           use scope = app.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope ()
           scope.ServiceProvider.GetService<AppDbContext>().Database.Migrate ()
@@ -182,12 +176,10 @@ module Configure =
 /// The web application
 module App =
   
-  open System
   open System.IO
 
-  let exitCode = 0
+  [<EntryPoint>]
-
+  let main _ =
-  let CreateWebHostBuilder _ =
     let contentRoot = Directory.GetCurrentDirectory ()
     WebHostBuilder()
       .UseContentRoot(contentRoot)
@@ -196,10 +188,7 @@ module App =
       .UseWebRoot(Path.Combine (contentRoot, "wwwroot"))
       .ConfigureServices(Configure.services)
       .ConfigureLogging(Configure.logging)
-      .Configure(Action<IApplicationBuilder> Configure.app)
+      .Configure(System.Action<IApplicationBuilder> Configure.app)
-
+      .Build()
-  [<EntryPoint>]
+      .Run ()
-  let main args =
+    0
-    CreateWebHostBuilder(args).Build().Run()
-        
-    exitCode

src/PrayerTracker/Church.fs

@@ -5,6 +5,7 @@ open Giraffe
 open PrayerTracker
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
+open PrayerTracker.Views.CommonFunctions
 open System
 open System.Threading.Tasks
 
@@ -14,7 +15,7 @@ let private findStats (db : AppDbContext) churchId =
     let! grps = db.CountGroupsByChurch   churchId
     let! reqs = db.CountRequestsByChurch churchId
     let! usrs = db.CountUsersByChurch    churchId
-    return (churchId.ToString "N"), { smallGroups = grps; prayerRequests = reqs; users = usrs }
+    return flatGuid churchId, { smallGroups = grps; prayerRequests = reqs; users = usrs }
     }
 
 

src/PrayerTracker/Extensions.fs

@@ -2,6 +2,7 @@
 module PrayerTracker.Extensions
 
 open Microsoft.AspNetCore.Http
+open Microsoft.FSharpLu
 open Newtonsoft.Json
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
@@ -19,14 +20,14 @@ type ISession with
     | v -> JsonConvert.DeserializeObject<'T> v
 
   member this.GetSmallGroup () =
-    this.GetObject<SmallGroup> Key.Session.currentGroup |> optRec
+    this.GetObject<SmallGroup> Key.Session.currentGroup |> Option.fromObject
   member this.SetSmallGroup (group : SmallGroup option) =
     match group with
     | Some g -> this.SetObject Key.Session.currentGroup g
     | None -> this.Remove Key.Session.currentGroup
 
   member this.GetUser () =
-    this.GetObject<User> Key.Session.currentUser |> optRec
+    this.GetObject<User> Key.Session.currentUser |> Option.fromObject
   member this.SetUser (user: User option) =
     match user with
     | Some u -> this.SetObject Key.Session.currentUser u

src/PrayerTracker/Help.fs

@@ -1,36 +0,0 @@
-module PrayerTracker.Handlers.Help
-
-open Giraffe
-open PrayerTracker
-open System
-
-/// Help template lookup
-let private templates =
-  [ Help.sendAnnouncement.Url,     Views.Help.sendAnnouncement
-    Help.maintainGroupMembers.Url, Views.Help.groupMembers
-    Help.groupPreferences.Url,     Views.Help.preferences
-    Help.editRequest.Url,          Views.Help.editRequest
-    Help.maintainRequests.Url,     Views.Help.requests
-    Help.viewRequestList.Url,      Views.Help.viewRequests
-    Help.logOn.Url,                Views.Help.logOn
-    Help.changePassword.Url,       Views.Help.password
-    ]
-  |> Map.ofList
-
-
-/// GET /help
-let index : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    viewInfo ctx DateTime.Now.Ticks
-    |> Views.Help.index
-    |> renderHtml next ctx
-
-
-/// GET /help/[module]/[topic]
-let show (``module``, topic) : HttpHandler =
-  requireAccess [ AccessLevel.Public ]
-  >=> fun next ctx ->
-    match templates.TryGetValue (sprintf "%s/%s" ``module`` topic) with
-    | true, view -> renderHtml next ctx (view ())
-    | false, _ -> fourOhFour next ctx

src/PrayerTracker/PrayerRequest.fs

@@ -58,7 +58,7 @@ let edit (reqId : PrayerRequestId) : HttpHandler =
       match reqId = Guid.Empty with
       | true ->
           return!
-            { viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Help.editRequest }
+            { viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Some Help.editRequest }
             |> Views.PrayerRequest.edit EditRequest.empty (now.ToString "yyyy-MM-dd") ctx
             |> renderHtml next ctx
       | false ->
@@ -78,7 +78,7 @@ let edit (reqId : PrayerRequestId) : HttpHandler =
                   |> addUserMessage ctx
               | false -> ()
               return!
-                { viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Help.editRequest }
+                { viewInfo ctx startTicks with script = [ "ckeditor/ckeditor" ]; helpLink = Some Help.editRequest }
                 |> Views.PrayerRequest.edit (EditRequest.fromRequest req) "" ctx
                 |> renderHtml next ctx
           | Error e -> return! e next ctx
@@ -199,7 +199,7 @@ let maintain onlyActive : HttpHandler =
     task {
       let reqs = db.AllRequestsForSmallGroup grp (ctx.GetService<IClock> ()) None onlyActive
       return!
-        { viewInfo ctx startTicks with helpLink = Help.maintainRequests }
+        { viewInfo ctx startTicks with helpLink = Some Help.maintainRequests }
         |> Views.PrayerRequest.maintain reqs grp onlyActive ctx
         |> renderHtml next ctx
       }

src/PrayerTracker/PrayerTracker.fsproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <AssemblyVersion>7.1.0.0</AssemblyVersion>
+    <AssemblyVersion>7.2.0.0</AssemblyVersion>
     <FileVersion>7.0.0.0</FileVersion>
     <Authors></Authors>
     <Company>Bit Badger Solutions</Company>
@@ -19,7 +19,6 @@
     <Compile Include="Email.fs" />
     <Compile Include="CommonFunctions.fs" />
     <Compile Include="Church.fs" />
-    <Compile Include="Help.fs" />
     <Compile Include="Home.fs" />
     <Compile Include="PrayerRequest.fs" />
     <Compile Include="SmallGroup.fs" />
@@ -28,11 +27,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="3.1.0" />
+    <PackageReference Include="Giraffe" Version="3.6.0" />
     <PackageReference Include="Giraffe.TokenRouter" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.2" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.5.2" />
+    <PackageReference Update="FSharp.Core" Version="4.6.2" />
   </ItemGroup>
 
 </Project>

src/PrayerTracker/SmallGroup.fs

@@ -9,6 +9,7 @@ open PrayerTracker
 open PrayerTracker.Cookies
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
+open PrayerTracker.Views.CommonFunctions
 open System
 open System.Threading.Tasks
 
@@ -23,7 +24,7 @@ let announcement : HttpHandler =
   requireAccess [ User ]
   >=> fun next ctx ->
     let startTicks = DateTime.Now.Ticks
-    { viewInfo ctx startTicks with helpLink = Help.sendAnnouncement; script = [ "ckeditor/ckeditor" ] }
+    { viewInfo ctx startTicks with helpLink = Some Help.sendAnnouncement; script = [ "ckeditor/ckeditor" ] }
     |> Views.SmallGroup.announcement (currentUser ctx).isAdmin ctx
     |> renderHtml next ctx
 
@@ -133,9 +134,9 @@ let logOn (groupId : SmallGroupId option) : HttpHandler =
     let startTicks = DateTime.Now.Ticks
     task {
       let! grps  = ctx.dbContext().ProtectedGroups ()
-      let  grpId = match groupId with Some gid -> gid.ToString "N" |  None -> ""
+      let  grpId = match groupId with Some gid -> flatGuid gid |  None -> ""
       return!
-        { viewInfo ctx startTicks with helpLink = Help.logOn }
+        { viewInfo ctx startTicks with helpLink = Some Help.logOn }
         |> Views.SmallGroup.logOn grps grpId ctx
         |> renderHtml next ctx
       }
@@ -162,7 +163,7 @@ let logOnSubmit : HttpHandler =
             return! redirectTo false "/prayer-requests/view" next ctx
         | None ->
             addError ctx s.["Password incorrect - login unsuccessful"]
-            return! redirectTo false (sprintf "/small-group/log-on/%s" (m.smallGroupId.ToString "N")) next ctx
+            return! redirectTo false (sprintf "/small-group/log-on/%s" (flatGuid m.smallGroupId)) next ctx
       | Error e -> return! bindError e next ctx
       }
 
@@ -193,7 +194,7 @@ let members : HttpHandler =
       let! mbrs = db.AllMembersForSmallGroup grp.smallGroupId
       let  typs = ReferenceList.emailTypeList grp.preferences.defaultEmailType s |> Map.ofSeq
       return!
-        { viewInfo ctx startTicks with helpLink = Help.maintainGroupMembers }
+        { viewInfo ctx startTicks with helpLink = Some Help.maintainGroupMembers }
         |> Views.SmallGroup.members mbrs typs ctx
         |> renderHtml next ctx
       }
@@ -237,7 +238,7 @@ let preferences : HttpHandler =
     task {
       let! tzs = ctx.dbContext().AllTimeZones ()
       return!
-        { viewInfo ctx startTicks with helpLink = Help.groupPreferences }
+        { viewInfo ctx startTicks with helpLink = Some Help.groupPreferences }
         |> Views.SmallGroup.preferences (EditPreferences.fromPreferences (currentGroup ctx).preferences) tzs ctx
         |> renderHtml next ctx
       }

src/PrayerTracker/User.fs

@@ -8,6 +8,7 @@ open PrayerTracker
 open PrayerTracker.Cookies
 open PrayerTracker.Entities
 open PrayerTracker.ViewModels
+open PrayerTracker.Views.CommonFunctions
 open System
 open System.Collections.Generic
 open System.Net
@@ -200,7 +201,7 @@ let logOn : HttpHandler =
           addWarning ctx s.["The page you requested requires authentication; please log on below."]
       | None -> ()
       return!
-        { viewInfo ctx startTicks with helpLink = Help.logOn }
+        { viewInfo ctx startTicks with helpLink = Some Help.logOn }
         |> Views.User.logOn { UserLogOn.empty with redirectUrl = url } groups ctx
         |> renderHtml next ctx
       }
@@ -224,7 +225,7 @@ let maintain : HttpHandler =
 let password : HttpHandler =
   requireAccess [ User ]
   >=> fun next ctx ->
-    { viewInfo ctx DateTime.Now.Ticks with helpLink = Help.changePassword }
+    { viewInfo ctx DateTime.Now.Ticks with helpLink = Some Help.changePassword }
     |> Views.User.changePassword ctx
     |> renderHtml next ctx
 
@@ -270,7 +271,7 @@ let save : HttpHandler =
                         |> Some
                     }
                   |> addUserMessage ctx
-                  return! redirectTo false (sprintf "/user/%s/small-groups" (u.userId.ToString "N")) next ctx
+                  return! redirectTo false (sprintf "/user/%s/small-groups" (flatGuid u.userId)) next ctx
               | false ->
                   addInfo ctx s.["Successfully {0} user", s.["Updated"].Value.ToLower ()]
                   return! redirectTo false "/users" next ctx
@@ -292,7 +293,7 @@ let saveGroups : HttpHandler =
           match Seq.length m.smallGroups with
           | 0 ->
               addError ctx s.["You must select at least one group to assign"]
-              return! redirectTo false (sprintf "/user/%s/small-groups" (m.userId.ToString "N")) next ctx
+              return! redirectTo false (sprintf "/user/%s/small-groups" (flatGuid m.userId)) next ctx
           | _ ->
               let  db   = ctx.dbContext ()
               let! user = db.TryUserByIdWithGroups m.userId
@@ -330,12 +331,7 @@ let smallGroups userId : HttpHandler =
       match user with
       | Some u ->
           let! grps      = db.GroupList ()
-          let  curGroups =
+          let  curGroups = u.smallGroups |> Seq.map (fun g -> flatGuid g.smallGroupId) |> List.ofSeq
-            seq {
-              for g in u.smallGroups do
-                yield g.smallGroupId.ToString "N"
-              }
-            |> List.ofSeq
           return! 
             viewInfo ctx startTicks
             |> Views.User.assignGroups (AssignGroups.fromUser u) grps curGroups ctx

src/PrayerTracker/wwwroot/js/app.js

@@ -9,7 +9,7 @@ const PT = {
    * @param {string} url The URL for the help page.
    */
   showHelp(url) {
-    window.open(`/help/${url}`, 'helpWindow', 'height=600px,width=450px,toolbar=0,menubar=0,scrollbars=1')
+    window.open(url, 'helpWindow', 'height=600px,width=450px,toolbar=0,menubar=0,scrollbars=1')
     return false
   },