[arch-releng] [PATCH 1/2] releng: Place helptext closer to its option list
Place all the elements with the helptext class that follow a <ul> closer to the <ul>. Signed-off-by: Tom Willemsen <ryuslash@gmail.com> --- media/archweb.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/media/archweb.css b/media/archweb.css index 504c827..9832d58 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -264,6 +264,7 @@ ul.admin-actions li { display: inline; padding-left: 1.5em; } #releng-feedback label { width: auto; display: inline; font-weight: normal; } #releng-feedback ul { padding-left: 1em; } #releng-feedback li { list-style: none; } +#releng-feedback ul+.helptext { position: relative; top: -0.9em; } /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a { color: white !important; } -- 1.7.5.1
Signed-off-by: Tom Willemsen <ryuslash@gmail.com> --- releng/fixtures/clockchoices.json | 55 +++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801..da1f429 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@ "pk": 1, "model": "releng.clockchoice", "fields": { - "name": "unchanged" + "name": "default region/timezone. keep clock" } }, { "pk": 2, "model": "releng.clockchoice", "fields": { - "name": "configured manually" + "name": "default region/timezone. change clock manually (UTC)" } }, { "pk": 3, "model": "releng.clockchoice", "fields": { - "name": "NTP" + "name": "default region/timezone. change clock NTP (UTC)" + } + }, + { + "pk": 4, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone. change clock manually (localtime)" + } + }, + { + "pk": 5, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone. change clock NTP (localtime)" + } + }, + { + "pk": 6, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. keep clock" + } + }, + { + "pk": 7, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock manually (UTC)" + } + }, + { + "pk": 8, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock NTP (UTC)" + } + }, + { + "pk": 9, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock manually (localtime)" + } + }, + { + "pk": 10, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock NTP (localtime)" } } ] -- 1.7.5.1
On Sun, 15 May 2011 15:00:50 +0200 Tom Willemsen <ryuslash@gmail.com> wrote:
Signed-off-by: Tom Willemsen <ryuslash@gmail.com> (..)
I can confirm these are the options I want in the app. ( https://bugs.archlinux.org/task/24042 ) Dieter
On Sun, May 15, 2011 at 8:00 AM, Tom Willemsen <ryuslash@gmail.com> wrote:
Signed-off-by: Tom Willemsen <ryuslash@gmail.com>
The grammar checker in me strikes again: * If we're using full-stop punctuation (periods), we shouldn't be doing this lowercase stuff nor omitting one at the end. I think it makes more sense to use commas everywhere, no? * "change clock NTP" needs something else in there, e.g. "change clock using NTP" or "change clock with NTP". -Dan
--- releng/fixtures/clockchoices.json | 55 +++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801..da1f429 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@ "pk": 1, "model": "releng.clockchoice", "fields": { - "name": "unchanged" + "name": "default region/timezone. keep clock" } }, { "pk": 2, "model": "releng.clockchoice", "fields": { - "name": "configured manually" + "name": "default region/timezone. change clock manually (UTC)" } }, { "pk": 3, "model": "releng.clockchoice", "fields": { - "name": "NTP" + "name": "default region/timezone. change clock NTP (UTC)" + } + }, + { + "pk": 4, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone. change clock manually (localtime)" + } + }, + { + "pk": 5, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone. change clock NTP (localtime)" + } + }, + { + "pk": 6, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. keep clock" + } + }, + { + "pk": 7, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock manually (UTC)" + } + }, + { + "pk": 8, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock NTP (UTC)" + } + }, + { + "pk": 9, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock manually (localtime)" + } + }, + { + "pk": 10, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone. change clock NTP (localtime)" } } ] -- 1.7.5.1
Signed-off-by: Tom Willemsen <ryuslash@gmail.com> --- releng/fixtures/clockchoices.json | 55 +++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801..700adeb 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@ "pk": 1, "model": "releng.clockchoice", "fields": { - "name": "unchanged" + "name": "default region/timezone, keep clock" } }, { "pk": 2, "model": "releng.clockchoice", "fields": { - "name": "configured manually" + "name": "default region/timezone, change clock manually (UTC)" } }, { "pk": 3, "model": "releng.clockchoice", "fields": { - "name": "NTP" + "name": "default region/timezone, change clock with NTP (UTC)" + } + }, + { + "pk": 4, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone, change clock manually (localtime)" + } + }, + { + "pk": 5, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone, change clock with NTP (localtime)" + } + },2 + { + "pk": 6, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, keep clock" + } + }, + { + "pk": 7, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock manually (UTC)" + } + }, + { + "pk": 8, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock with NTP (UTC)" + } + }, + { + "pk": 9, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock manually (localtime)" + } + }, + { + "pk": 10, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock with NTP (localtime)" } } ] -- 1.7.5.1
On Sun, May 15, 2011 at 12:14 PM, Tom Willemsen <ryuslash@gmail.com> wrote:
Signed-off-by: Tom Willemsen <ryuslash@gmail.com>
Thanks! One note below.
--- releng/fixtures/clockchoices.json | 55 +++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801..700adeb 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@ "pk": 1, "model": "releng.clockchoice", "fields": { - "name": "unchanged" + "name": "default region/timezone, keep clock" } }, { "pk": 2, "model": "releng.clockchoice", "fields": { - "name": "configured manually" + "name": "default region/timezone, change clock manually (UTC)" } }, { "pk": 3, "model": "releng.clockchoice", "fields": { - "name": "NTP" + "name": "default region/timezone, change clock with NTP (UTC)" + } + }, + { + "pk": 4, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone, change clock manually (localtime)" + } + }, + { + "pk": 5, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone, change clock with NTP (localtime)" + } + },2 Failsauce on this line, I should have caught it sooner but no big deal: http://projects.archlinux.org/archweb.git/commit/?id=7c663a77b187e4592ce112d...
+ { + "pk": 6, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, keep clock" + } + }, + { + "pk": 7, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock manually (UTC)" + } + }, + { + "pk": 8, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock with NTP (UTC)" + } + }, + { + "pk": 9, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock manually (localtime)" + } + }, + { + "pk": 10, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock with NTP (localtime)" } } ] -- 1.7.5.1
On Sun, May 15, 2011 at 8:00 AM, Tom Willemsen <ryuslash@gmail.com> wrote:
Place all the elements with the helptext class that follow a <ul> closer to the <ul>.
Signed-off-by: Tom Willemsen <ryuslash@gmail.com> Is this good to go across the standard-compliant browsers? Looks like it from here at least, so I'll get this applied: http://www.quirksmode.org/css/contents.html
--- media/archweb.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/media/archweb.css b/media/archweb.css index 504c827..9832d58 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -264,6 +264,7 @@ ul.admin-actions li { display: inline; padding-left: 1.5em; } #releng-feedback label { width: auto; display: inline; font-weight: normal; } #releng-feedback ul { padding-left: 1em; } #releng-feedback li { list-style: none; } +#releng-feedback ul+.helptext { position: relative; top: -0.9em; }
/* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a { color: white !important; } -- 1.7.5.1
participants (3)
-
Dan McGee
-
Dieter Plaetinck
-
Tom Willemsen