micropelago/domani
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More polish to the interface, grammar edits from Kelly

Browse Source
This commit is contained in:
Brian Picciano 2023-08-05 11:24:04 +02:00
parent bd6684ea2a
commit f56acd65b0
5 changed files with 62 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/service/http.rs
View File

@ -263,6 +263,7 @@ impl Service {
dns_records: &'a [service::ConfigDNSRecord],
challenge_token: String,
dns_records_have_more_than_one: bool,
dns_records_have_cname: bool,
}
@ -304,6 +305,7 @@ impl Service {
dns_records: &self.config.dns_records,
challenge_token: settings_hash,
dns_records_have_more_than_one: self.config.dns_records.len() > 1,
dns_records_have_cname,
},
)
@ -345,13 +347,13 @@ impl Service {
}
Err(domain::manager::SyncWithSettingsError::InvalidURL) => (Some(
"Fetching the git repository failed, please double check that you input the correct
"Fetching the git repository failed; please double check that you input the correct
URL."
.to_string(),
), false),
Err(domain::manager::SyncWithSettingsError::InvalidBranchName) => (Some(
"The git repository does not have a branch of the given name, please double check
"The git repository does not have a branch of the given name; please double check
that you input the correct name."
.to_string(),
), false),

22
src/service/http/tpl/domain.html
View File

@ -4,21 +4,23 @@
{{# if data.settings }}
<p>Your domain <code>{{ data.domain }}</code> is already configured with
Domani. You can see the existing configuration below. If you modify any values
you will need to hit the "Next" button to complete the update.</p>
<p>
Your domain <code>{{ data.domain }}</code> is already configured using the
settings shown below. To save any changes you make here, you will need to hit
the "Next" button and follow the subsequent instructions.
</p>
{{ else }}
<p>Your domain <code>{{ data.domain }}</code> is not yet configured with Domani.
To get started, please input the details of a public git repo which will be used
to serve your domain. When you update the given branch, your domain will be
automatically updated too!</p>
<p>
Your domain <code>{{ data.domain }}</code> is not yet configured. Please input
the details of a public git repo, which will be used to serve your domain.
</p>
{{/if}}
<p><em>In the future Domani will support more backends than just git
repos.</em></p>
<p><em>In the future, Domani will support more backends than just git
repos.</em></p>
<form method="{{ form_method }}" action="/domain_init.html">
<input name="domain" type="hidden" value="{{ data.domain }}" />
@ -54,7 +56,7 @@ automatically updated too!</p>
<p>
<label>
Directory or sub-directory to serve files from:
Sub-directory from which to serve files:
<input name="domain_setting_add_path_prefix"
type="text"
placeholder="directory/sub-directory"

35
src/service/http/tpl/domain_init.html
View File

@ -1,7 +1,9 @@
<h2>Configure Your Nameserver</h2>
<p>This step requires a passphrase that has been given to you by the
administrator of the Domani server:</p>
<p>
This step requires a passphrase that has been given to you by the administrator
of the Domani server:
</p>
<form method="{{ form_method }}" action="/domain_sync.html" id="syncForm">
<input name="domain" type="hidden" value="{{ data.domain }}" />
@ -18,9 +20,11 @@ administrator of the Domani server:</p>
</form>
<p>Next you will need to configure your nameserver to point to Domani. There are
<p>
Next, you will need to configure your nameserver to point to Domani. There are
two entries you will need to add. The first entry tells the Domani server that
it is allowed to serve this domain with your given configuration:</p>
it is allowed to serve this domain with your given configuration:
</p>
<table>
<tr>
@ -35,8 +39,15 @@ it is allowed to serve this domain with your given configuration:</p>
</tr>
</table>
<p>The second entry ensures that other users find the Domani server when they
query for your domain name. It can be <strong>one or more of</strong>:</p>
<p>
The second entry ensures that other users find the Domani server when they
query for your domain name.
{{ #if data.dns_records_have_more_than_one }}
It can be any of these:
{{ /if }}
</p>
<table>
<tr>
@ -59,13 +70,17 @@ query for your domain name. It can be <strong>one or more of</strong>:</p>
</table>
{{ #if data.dns_records_have_cname }}
<p>(Please note that not all nameserver support using a CNAME in all cases,
<p>
(Please note that not all nameservers support using a CNAME in all cases,
while others support it via an alternative record type like ALIAS or ANAME. If
one of those are available they can be used instead.)</p>
one of those are available, they can be used instead.)
</p>
{{ /if }}
<p>Once both entries are installed, you can hit the following button to check
<p>
Once both entries are installed, you can hit the following button to check
your configuration and set up your domain. Note that this step may take a long
time to complete, so if nothing happens immediately please don't panic.</p>
time to complete, so if nothing happens immediately please don't panic.
</p>
<input type="submit" value="Next" form="syncForm" />

6
src/service/http/tpl/domains.html
View File

@ -1,7 +1,9 @@
<h2>All Domains</h2>
<p>Below are listed all domains which this Domani instance is currently
serving</p>
<p>
These are all the domains that are currently being managed by this Domani
instance:
</p>
<ul>
{{ #each data.domains }}

30
src/service/http/tpl/index.html
View File

@ -1,10 +1,10 @@
<p>Domani makes it as easy as possible to host a website on your own domain
<p>Domani makes it as easy as possible to host a website using your own domain
name. No account is needed, just two simple steps and you're done!</p>
<h2>Get Started</h2>
<p>Input your domain name below to set it up, or to reconfigure a domain which
<p>Input your domain name below to set it up, or to reconfigure a domain that
you have already set up.</p>
<form method="{{ form_method }}" action="/domain.html">
@ -31,14 +31,16 @@ you have already set up.</p>
<h2>How It Works</h2>
<p>
You will direct Domani to serve files from some external backend, for example a
You will direct Domani to serve files from some external backend, for example, a
git repository. Domani will handle all the details of generating TLS
certificates, fetching the files, and serving traffic to your website.
</p>
<p>To change the content of your website, just change the files in your
configured backend. The changes will be reflected on your website after a short
refresh period.</p>
<p>
To change the content of your website, just change the files in your configured
backend. The changes will be reflected on your website after a short refresh
period.
</p>
<h3>Gemini Support</h3>
@ -48,17 +50,19 @@ with a focus on content, simplicity, and user-centrism.
</p>
<p>
Domani supports both normal websites and gemini capsules, and will serve the
same domain on both protocols at the same time. Getting started with gemini is
Domani supports both normal websites and Gemini capsules, and will serve the
same domain on both protocols at the same time. Getting started with Gemini is
as simple as creating an <code>index.gmi</code>
<a href="https://gemini.circumlunar.space/docs/cheatsheet.gmi">gemtext</a> file
in your backend, and visiting your domain in a
<a href="https://github.com/kr1sp1n/awesome-gemini#graphical">gemini client</a>.
<a href="https://github.com/kr1sp1n/awesome-gemini#graphical">Gemini client</a>.
</p>
<h2>About</h2>
<p>Domani is an open-source project which is designed to be hosted by
individuals for their community of friends and family. By making it super easy
to set up a domain we can help our non-technical folk own their own slice of
the internet, the way it was always intended.</p>
<p>
Domani is an open-source project designed to be hosted by individuals for their
community of friends and family. By making it super easy to set up a domain, we
can help our non-technical folk own their own slice of the internet, the way it
was always intended.
</p>