Commit graph

3041 commits

Author SHA1 Message Date
Tom Hughes
700bf13279 Merge remote-tracking branch 'upstream/pull/3292' 2021-08-12 17:57:54 +01:00
Andy Allan
2436f9e580 Use named paths for diary comments path 2021-08-12 17:57:40 +01:00
Andy Allan
536dee8fc7 Use named paths for various user blocks links 2021-08-12 17:57:40 +01:00
Andy Allan
d797de4317 Use user_account_path for links to settings page
Much easier to read than having to be explicit about controllers etc
2021-08-12 17:09:07 +01:00
Andy Allan
06d73857d1 Avoid using raw html in translations for links.
This is a followup to 26698d6 which introduced the html. It's better
to use interpolation for links, since this avoids the translations
from introducing html syntax errors.

I had to change the translation key, since changing the interpolation
variables alone would lead to breakages.
2021-08-12 16:35:54 +01:00
Andy Allan
57302832a4 Update the link for changing your editor preferences
I've left the internal name of the link the same, to avoid having to
change the translation key and retranslate everything.
2021-08-12 16:30:34 +01:00
Adam Hoyle
5df061f558 improve link ordering 2021-08-12 09:53:43 +01:00
Adam Hoyle
116cfe2f4d render local chapters in html 2021-08-11 23:45:58 +01:00
Tom Hughes
26698d6d26 Use correct link for users with no location
Fixes #3290
2021-08-09 18:29:54 +01:00
Adam Hoyle
86912a61df stub model and show in view 2021-08-08 23:28:44 +01:00
Adam Hoyle
ffc6b697f0 add communities page 2021-08-08 23:27:34 +01:00
Adam Hoyle
d8d1ab1776 add route for communities 2021-08-07 15:46:39 +01:00
Tom Hughes
e842c7be97 Add missing autocomplete attributes 2021-07-27 19:36:47 +01:00
Tom Hughes
f1935b1c57 Merge remote-tracking branch 'upstream/pull/3257' 2021-07-21 19:24:31 +01:00
Andy Allan
44199f23e1 Use an unstyled list for showing the languages 2021-07-21 19:10:55 +01:00
Andy Allan
403c8941a6 Ensure that flash message is shown in the updated language 2021-07-21 18:58:47 +01:00
Tom Hughes
0bbdadd727 Merge remote-tracking branch 'upstream/pull/3233' 2021-07-21 18:37:17 +01:00
Josh Soref
a3c5bbbbb6 spelling: (self reference is superfluous)
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
2021-07-21 10:45:38 -04:00
Andy Allan
2a885c2cce Ensure the heading text appears above the illustration
The easiest way to do this is to make the text a child of the div
with the background image. The change to min-size is so that if
the text wraps often enough on narrow screens, the header expands
vertically rather than the text spilling over.

Fixes #3259
2021-07-21 15:08:33 +01:00
Andy Allan
2443e7dd65 Refactor to use a heading class for height when using header-illustrations
This fixes a glitch highlighted in #3259, where the css class stopped applying
when the view was moved to a different controller.

We're moving to having each view responsible for their layout, and commonly having
override classes explicitly in the relevant views. So we can follow that pattern here.
2021-07-21 11:45:37 +01:00
Andy Allan
0ab9359f9f Ensure message destroy button has danger colour when showing the message, and add button to show page when viewing sent messages 2021-07-14 18:54:23 +01:00
Andy Allan
e073f93bbd Ensure the message title shows in the heading for both sent and received messages
I'm not sure why they were ever different.
2021-07-14 18:40:02 +01:00
Andy Allan
d89c4f887c Add a title in the heading to match the main menu text 2021-07-14 18:36:52 +01:00
Andy Allan
a8b4325be9 Convert mailbox navigation to use tabs 2021-07-14 18:34:39 +01:00
Andy Allan
caf2e2a242 Move profile-related settings to their own form
Refs #3167
2021-07-14 17:45:19 +01:00
Andy Allan
2403630da8 Split user preferences into a separate page
Refs #3167
2021-07-14 17:40:20 +01:00
Andy Allan
0c7ad10573 Refactor About header to use bootstrap and flex
This reduces the amount of custom CSS required for the layout, and
makes it responsive on small screen sizes.
2021-06-30 15:21:49 +01:00
Tom Hughes
a32b751fed Remove some references to webmaster 2021-06-29 19:22:31 +01:00
Tom Hughes
1bc1905248 Restore browse-section class to changeset view
Fixes #3234
2021-06-25 20:26:51 +01:00
Tom Hughes
8d76be71bb Merge remote-tracking branch 'upstream/pull/3177' 2021-06-24 08:43:18 +01:00
Andy Allan
0876ea0bee Refactor terms declined flash message to use a partial
This allows us to include a link in the flash message, without having
to use html_safe. Also refactor to avoid having html angle brackets in
the translation strings, while still allowing locale-specific urls.
2021-06-23 20:11:19 +01:00
Andy Allan
3dd639c8d0 Refactor flash messages to use a flex row for positioning
This works better for narrow widths and needs less custom CSS.
2021-06-23 20:11:19 +01:00
Andy Allan
7809bfa027 Ensure that all floated elements in the header stay within it
In certain circumstance, due to either extreme narrow screen widths,
or due to padding on floating elements exceeding the header height,
some things could appear outwith the header. This clearfix avoids
this from happening.
2021-06-23 20:11:19 +01:00
Andy Allan
40589960be Use paragraphs instead of line breaks, and avoid using html in translation strings 2021-06-23 20:11:19 +01:00
Andy Allan
24f6aeda6a Use hash-based flash objects to render complex flash messages
Since flash objects can only be String, Hash or Array (notably excluding SafeBuffers), then this approach is necessary to render complex html in a safe manner.

Each local can be treated as an (unsafe) string, and therefore escaped normally when rendered into the template. The template (and translation strings) can
contain html since they are no longer stored in the flash as a plain string.

Fixes #3215
2021-06-23 20:10:55 +01:00
Tom Hughes
4a45092e27 Remove the Yahoo OpenID link as they no longer support OpenID 2021-06-17 22:33:05 +01:00
Tom Hughes
d02b8d9f1e Merge remote-tracking branch 'upstream/pull/3226' 2021-06-16 18:07:38 +01:00
Andy Allan
a32854fa52 Wrap the rss and upload buttons in a div, with suitable padding for both vertical and horizontal tab layouts
This ensures it looks right when the tabs are collapsed vertically.
2021-06-16 17:08:26 +01:00
Andy Allan
81ad715474 Rework tabs to use flexbox
This improves the behaviour on small widths, where the tabs stack neatly. It also avoids the use of ml-auto which isn't RTL compatible.

The change in indentation is because it was previously coded with multiple li nested inside another li
2021-06-16 16:48:23 +01:00
Andy Allan
62349d1856 Make tab labels into nouns that describe what's on the tab
I think that works better with tabs, whereas actions (verbs) work better with buttons.
2021-06-16 16:27:45 +01:00
Andy Allan
7996b84380 Rearrange tabs for inter-page consistency
The all traces tab comes first, since it's shown on every page as you click around. Otherwise the tabs appear to be constantly rearranging themselves.
2021-06-16 16:26:25 +01:00
Michal Migurski
33f9b7c55f Fixed remaining erblint complaint 2021-06-16 15:55:55 +01:00
Michal Migurski
21eafac304 Fix erblint complaints 2021-06-16 15:55:55 +01:00
Tobias Jordans
f4e998804d Traces#index: Introduce tab navigation, fix tag-filter
- introduce bootstrap tabs to switch the views
- introduce `content_for :heading_class` to remove the padding below the bootstrap tabs
- update the rss-image to use a svg, adopted from https://icons.getbootstrap.com/icons/rss/ (without the outer border)
- move rss- and new-button away from the view-switching actions
- the `@tag` logic was broken. introduce new link to remove the tag-filter; the tabs keep the filter once given; use params[:tag] directly in the view
- use `&.` syntax nil-safety so we can remove `@display_name`
2021-06-16 15:55:55 +01:00
Andy Allan
c8f0a81eb7 Rework sidebar to use padding on the sidebar_content div
This saves every header, list, paragraph etc having to sort out their own padding. The couple of instances where we want edge-to-edge can be acheived using the negative margin spacing utilities.

The padding is based on $spacer so that it can be adjusted automatically via bootstrap configuration.

This also means that we can remove many (mis-)uses of the browse-section class, which is only supposed to be for cases where there are multiple browse-sections in sequence (e.g. multiple nodes in the node history browse pages).
2021-06-16 15:45:58 +01:00
Tom Hughes
2c5e981684 Fix erblint warnings 2021-06-05 07:40:55 +01:00
Andy Allan
b18c1bff8b Use built-in translation lookups for form helps 2021-05-19 16:22:14 +01:00
Andy Allan
7c26d84a84 Rework some of the OAuth2 views, adding links and messages when there are no applications. 2021-05-19 16:22:14 +01:00
Tom Hughes
5868be1f7b Show scope names in application views 2021-05-18 12:05:33 +01:00
Tom Hughes
e222329d04 Add support for OAuth2 using doorkeeper 2021-05-18 12:05:32 +01:00