Instrument installation is not possible given the current server
- configuration; the LORIS 'quatUser' is not configured properly.
+ configuration; the LORIS 'adminUser' is not configured properly.
File upload is still possible but instruments will need to be
installed manually
diff --git a/modules/instrument_manager/php/instrument_manager.class.inc b/modules/instrument_manager/php/instrument_manager.class.inc
index c815f53608a..2459d4e9295 100644
--- a/modules/instrument_manager/php/instrument_manager.class.inc
+++ b/modules/instrument_manager/php/instrument_manager.class.inc
@@ -169,7 +169,7 @@ class Instrument_Manager extends \NDB_Menu_Filter
* Instead, inform users that an administrator must install it
* on their behalf.
* This should only happen for users on a system where automatic
- * installation is disabled (ie. has no quatUser).
+ * installation is disabled (ie. has no adminUser).
*/
return new \LORIS\Http\Response\JSON\Conflict(
self::FILE_ALREADY_EXISTS
@@ -189,7 +189,7 @@ class Instrument_Manager extends \NDB_Menu_Filter
);
if (!$this->isQuatUserConfigured()) {
- // If no quatUser is configured, automatic installation is not
+ // If no adminUser is configured, automatic installation is not
// possible, so this is the last step.
return (new \LORIS\Http\Response())
->withStatus(200, 'OK')
@@ -224,8 +224,8 @@ class Instrument_Manager extends \NDB_Menu_Filter
exec(
"mysql".
" -h" . escapeshellarg($db_config['host']).
- " -u" . escapeshellarg($db_config['quatUser']).
- " -p" . escapeshellarg($db_config['quatPassword']).
+ " -u" . escapeshellarg($db_config['adminUser']).
+ " -p" . escapeshellarg($db_config['adminPassword']).
" " . escapeshellarg($db_config['database']).
" < " . $this->path . "project/tables_sql/".
escapeshellarg($table_name . '.sql'),
@@ -591,21 +591,21 @@ class Instrument_Manager extends \NDB_Menu_Filter
}
/**
- * Return whether the quatUser is properly configured, ie. credentials are
+ * Return whether the adminUser is properly configured, ie. credentials are
* set and are valid.
- * The quatUser is a MySQL user with CREATE table permissions.
+ * The adminUser is a MySQL user with CREATE table permissions.
* `empty` is used instead of `isset` as blank values in the config file
* are still considered set.
*
- * @return bool True if a quatUser is configured properly. False if not.
+ * @return bool True if a adminUser is configured properly. False if not.
*/
protected function isQuatUserConfigured() : bool
{
$db = $this->factory->database();
$db_config = $this->factory->config()->getSetting('database');
- $credentials_set = !empty($db_config['quatUser'])
- && !empty($db_config['quatPassword']);
+ $credentials_set = !empty($db_config['adminUser'])
+ && !empty($db_config['adminPassword']);
if (!$credentials_set) {
return false;
}
@@ -615,8 +615,8 @@ class Instrument_Manager extends \NDB_Menu_Filter
try {
$connected = $db->connect(
$db_config['database'],
- $db_config['quatUser'],
- $db_config['quatPassword'],
+ $db_config['adminUser'],
+ $db_config['adminPassword'],
$db_config['host'],
false
);
diff --git a/raisinbread/config/config.xml b/raisinbread/config/config.xml
index 5322c2b7381..dbe8e93c350 100644
--- a/raisinbread/config/config.xml
+++ b/raisinbread/config/config.xml
@@ -20,8 +20,8 @@
+
+[](https://travis-ci.org/aces/Loris) [](https://acesloris.readthedocs.io/en/latest/?badge=latest)
# LORIS Neuroimaging Platform
@@ -112,4 +114,3 @@ LORIS is made by staff developers at the McGill Centre for Integrative Neuroscie
See [LORIS.ca](www.loris.ca) for our current team, the history of LORIS, and our **Technical Papers**.
The original (pre-GitHub) LORIS development team from 1999-2010 included: Dario Vins, Alex Zijdenbos, Jonathan Harlap, Matt Charlet, Andrew Corderey, Sebastian Muehlboeck, and Samir Das.
-
From 32718142b6162c1c4be40ab72d4b7ab1cfd4cc31 Mon Sep 17 00:00:00 2001
From: John Saigle <4022790+johnsaigle@users.noreply.github.com>
Date: Wed, 11 Dec 2019 15:32:01 -0500
Subject: [PATCH 03/26] Change LORIS logo in readme to SVG to prevent
blurriness (#5851)
Original PR should've used the SVG, not PNG.
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b08b6a477a5..acf3736d6fe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-
+
[](https://travis-ci.org/aces/Loris) [](https://acesloris.readthedocs.io/en/latest/?badge=latest)
From 71acc6149640e8491a3c7a2b48b4e5842d8b8abe Mon Sep 17 00:00:00 2001
From: Rida Abou-Haidar `) tags—simply use physical line breaks (spaces between lines) where necessary. + * Using `
` might be necessary only in lists of items + +## When to Use Emphasis + +Whether a user knows it or not, they will come to recognize styles that are consistent throughout the text. This way, their eyes can jump to a part of the text that addresses their issue, and they don’t need to read the whole thing. Follow these rules on using emphasis: + +* *Italicize* when referring to a specific place on the screen + * e.g. in the Selection Filters section + * e.g. in the Metadata column of the table + * e.g. in the Imaging menu +* **Bold** when referring to any clickable button, including modules and tabs + * DON’T call it a button + * e.g. Click **Submit** (rather than “click the **Submit** button”) + * DO call it a module or tab + * e.g. In the **Imaging Browser** module + * e.g. Click the **Upload** tab + * You can also use bold when defining features in a list to separate the term being defined from the definition itself, e.g. when describing columns in a table:
+ **Column heading 1**: description
+ **Column heading 2**: description
+ Etc. + +## Tone + +LORIS is used by scientific community members worldwide, which means it's possible that most users are non-native English speakers. Therefore, it is important that LORIS documentation (Help text, setup guides, etc.) be written in a way that is concise, clear, and free of needlessly ambiguous or complicated words. + +This means using more direct language and tone to get information across to the user in the least amount of time, with the least amount of friction. The quicker a user understands something, the happier they are. Easily understandable documentation also builds trust in the software, in addition to decreasing the amount of support questions we get. + +* Use second person point of view rather than third + * e.g. “This module allows *you* to browse…” (rather than “This module allows *users* to browse…”) +* Keep it concise. Avoid unnecessary information. + * Try not to be repetitive. + * e.g. the Help text for the Imaging Browser module begins with the title Imaging Browser. You don’t need to start text with “In the Imaging Browser module...”, because the user already knows the module based on the title. Instead, keep it short and say “In this module…” +* Assume the user is tech-savvy enough to know about features that are intuitive or common across modern platforms, so you don’t need to repeat in every Help text + * e.g. clicking the column headers to re-sort a table + * e.g. clicking a Download button to download something + * e.g. navigate pages of a table using the arrows provided +* Use Plain Language + * Avoid words that you wouldn't use in everyday speech +* Where relevant introduce an abbreviation once and then use that abbreviation for the rest of the copy in that help text (e.g. introduce Quality Control = QC in a Help text title, then only call it QC throughout the text) + * e.g. DO: “The Imaging Quality Control (QC) module allows you to view the QC status of images in your LORIS.” + * e.g. DON’T: “The Imaging Quality Control (QC) module allows you to view the Quality Control status of images in your LORIS.” +* Break up large blocks of text. It's more visually pleasing and less intimidating. + +For more information, including research studies conducted, on the use and value of Plain Language, please see [this article](https://www.nngroup.com/articles/plain-language-experts/) and feel free to browse the rest of this website for further helpful details, tips, and tricks. diff --git a/docs/images/helptext.png b/docs/images/helptext.png new file mode 100644 index 0000000000000000000000000000000000000000..5c367c4845c032dfad0c0fe6d4df9e4bbf51a1c6 GIT binary patch literal 7642 zcmb_=bySq?^Y?-vND9)qbhC&wEZtp73X+P%lCns{(k&q%EZs;+EnR{x0!uHFk|Ny= zFFw!r{r$e@y#K!UANQGSW
-
Welcome, {$username}.
+Welcome, {$username}!
Last login: {$last_login}
{if !is_null($project_description)}{$project_description}