Skip to content

Commit

Permalink
Merge pull request #10037 from owncloud/document-icons-and-colors
Browse files Browse the repository at this point in the history
feat: add docxf icon mapping and fix document icon colors
  • Loading branch information
JammingBen committed Nov 24, 2023
1 parent 8cc470b commit a561883
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 6 deletions.
1 change: 1 addition & 0 deletions deployments/oc10-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ There are a few config values which need to be set in order for ownCloud Web to
"apps" : [
"files",
"preview",
"search",
"draw-io"
],
"applications" : [
Expand Down
6 changes: 6 additions & 0 deletions getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,15 @@ Depending on the backend you are using, there are sample config files provided i
- `options.upload.xhr.timeout` Specifies the timeout for XHR uploads in milliseconds.
- `options.editor.autosaveEnabled` Specifies if the autosave for the editor apps is enabled.
- `options.editor.autosaveInterval` Specifies the time interval for the autosave of editor apps in seconds.
- `options.editor.openAsPreview` Specifies if non-personal files i.e. files in shares, spaces or public links are being opened in read only mode so the user needs to manually switch to edit mode. Can be set to `true`, `false` or an array of web app/editor names.
- `options.contextHelpersReadMore` Specifies whether the "Read more" link should be displayed or not.
- `options.openLinksWithDefaultApp` Specifies whether single file link shares should be opened with default app or not.
- `options.tokenStorageLocal` Specifies whether the access token will be stored in the local storage when set to `true` or in the session storage when set to `false`. If stored in the local storage, login state will be persisted across multiple browser tabs, means no additional logins are required. Defaults to `true`.
- `options.loginUrl` Specifies the target URL to the login page. This is helpful when an external IdP is used. This option is disabled by default. Example URL like: 'https://www.myidp.com/login'.
- `options.logoutUrl` Adds a link to the user's profile page to point him to an external page, where he can manage his session and devices. This is helpful when an external IdP is used. This option is disabled by default.
- `options.imprintUrl` Specifies the target URL for the imprint link valid for the ocis instance in the account menu.
- `options.privacyUrl` Specifies the target URL for the privacy link valid for the ocis instance in the account menu.
- `options.ocm.openRemotely` Specifies whether opening files in remote shares in their original ocm instance should be enabled. Defaults to `false`.

#### Scripts and Styles

Expand Down
14 changes: 8 additions & 6 deletions testing/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Bundle the web frontend with the following command:
$ pnpm build:w
```

Our compose setup automatically mounts it into an oC10 and oCIS backend, respectively. Web also gets recompiled on changes.
Our compose setup automatically mounts it into an oCIS backend, respectively. Web also gets recompiled on changes.

#### Run E2E Tests

Expand All @@ -77,11 +77,13 @@ To run a particular test, simply add the feature file and line number to the tes

Various options are available via ENV variables, e.g.

- `BASIC_AUTH=true` use basic authorization for api requests.
- `RETRY=n` to retry failures `n` times
- `SLOW_MO=n` to slow the execution time by `n` milliseconds
- `TIMEOUT=n` to set tests to timeout after `n` milliseconds
- `HEADLESS=bool` to open the browser while the tests run (defaults to true => headless mode)
- `BROWSER=name` to run tests against a specific browser. Defaults to Chrome, available are Chrome, Firefox, Webkit, Chromium
- `BROWSER=name` to run tests against a specific browser. Defaults to chromium, available are chromium, firefox, webkit, chromium
- `ADMIN_PASSWORD` to set administrator password. By default, the `admin` password is used in the test

For debugging reasons, you may want to record a video or traces of your test run.
Again, you can use the following ENV variables in your command:
Expand Down Expand Up @@ -126,17 +128,17 @@ $ pnpm build:w
The acceptance tests need additional docker containers to be running.

```shell
$ docker compose up ocis vnc selenium middleware-ocis
$ docker compose up ocis selenium middleware-ocis
```

and make sure there are no conflicting ports and everything runs smoothly. You can check if everything has worked by opening [https://host.docker.internal:9200](https://host.docker.internal:9200) and logging in using the demo user (admin/admin).

If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.4.0-20220814`for now. To do so, export `SELENIUM_IMAGE=seleniarm/standalone-chromium:4.4.0-20220814`.
If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.7.0-20221206`for now. To do so, export `SELENIUM_IMAGE=seleniarm/standalone-chromium:4.7.0-20221206`.

#### Run acceptance tests

- Change the directory to `tests/acceptance`
- Install all the test dependencies with `pnpm` command
- Install all the test dependencies with `pnpm install` command
- Run the tests

```shell
Expand All @@ -145,7 +147,7 @@ If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.4.0-2

#### Watch the Test Run

To watch the tests while running, open [http://host.docker.internal:6080/](http://host.docker.internal:6080/) in the browser to access your VNC client.
To watch the tests while running, open [http://host.docker.internal:7900/](http://host.docker.internal:7900/) in the browser to access your VNC client.

### Analyze the Test Report

Expand Down
28 changes: 28 additions & 0 deletions theming/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,26 @@ Spacing variables get prepended with `--oc-space-`, so e.g. _"xlarge"_ creates t
}
```

### App Banner
To configure the app banner shown on mobile devices, you can use the following settings (without these the app banner is disabled per default):

```json
{
"appBanner": {
"title": "ownCloud",
"publisher": "ownCloud GmbH",
"additionalInformation": "",
"ctaText": "OPEN",
"icon": "themes/owncloud/assets/owncloud-app-icon.png",
"appScheme": "owncloud"
}
}
```

`title` is usually your app's name as shown in the App Store or Google Play. `publisher` is the app developer's name.
`additionalInformation` can be used to specify pricing information, such as "FREE" or a catchphrase like "Don't miss out on our awesome app!".
`ctaText` refers to the text in the call to action button on the right side. The `icon` directive may be used to specify your own app icon. `appScheme` is the first part of the URL that is used to tell the mobile OS which app to open, so using `ownCloud` will generate links such as `owncloud://yourdomain.com/f/2b61b822...`.

## Example theme

An empty template for your custom theme is provided below, and you can use the instructions above to set it up according to your needs. Please note that since changing themes at runtime is not yet supported it only consists of a `default` theme.
Expand All @@ -277,6 +297,14 @@ An empty template for your custom theme is provided below, and you can use the i
"name": "",
"slogan": ""
},
"appBanner": {
"title": "",
"publisher": "",
"additionalInformation": "",
"ctaText": "",
"icon": "",
"appScheme": ""
},
"logo": {
"topbar": "",
"favicon": "",
Expand Down

0 comments on commit a561883

Please sign in to comment.