diff --git a/HISTORY.rst b/HISTORY.rst index e7eef90..815c0b3 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,9 @@ Changelog --------- +- Improves the print styles with a focus on printing tickets. + [href] + - Changes the look and feel of the formcode field to be more like other fields. [href] diff --git a/onegov/town/templates/layout.pt b/onegov/town/templates/layout.pt index f001b77..99e91ca 100644 --- a/onegov/town/templates/layout.pt +++ b/onegov/town/templates/layout.pt @@ -31,7 +31,7 @@
-
+ @@ -363,8 +364,10 @@ @@ -403,20 +406,24 @@
-
Date
-
- ${layout.format_date(start, 'date')} - - - ${layout.format_date(start, 'time')} - - ${layout.format_date(end, 'time')} - +
+
Date
+
+ ${layout.format_date(start, 'date')} + + + ${layout.format_date(start, 'time')} - + ${layout.format_date(end, 'time')} + +
-
Quota
-
${reservation.quota}
+
+
Quota
+
${reservation.quota}
+
diff --git a/onegov/town/templates/reservation_confirmation.pt b/onegov/town/templates/reservation_confirmation.pt index d4a7376..219925e 100644 --- a/onegov/town/templates/reservation_confirmation.pt +++ b/onegov/town/templates/reservation_confirmation.pt @@ -14,31 +14,35 @@
-
Date
-
- ${layout.format_date(reservation.display_start(), 'weekday_long')}, - ${layout.format_date(reservation.display_start(), 'date_long')} +
+
Date
+
+ ${layout.format_date(reservation.display_start(), 'weekday_long')}, + ${layout.format_date(reservation.display_start(), 'date_long')} +
- +
Timespan
The whole day
- +
- +
Timespan
${layout.format_date(reservation.display_start(), 'time')} - ${layout.format_date(reservation.display_end(), 'time')}
- +
- +
Quota
${reservation.quota}
- +
-
E-Mail
-
${reservation.email}
+
+
E-Mail
+
${reservation.email}
+
diff --git a/onegov/town/templates/ticket.pt b/onegov/town/templates/ticket.pt index 2546579..8bb7fec 100644 --- a/onegov/town/templates/ticket.pt +++ b/onegov/town/templates/ticket.pt @@ -21,39 +21,49 @@
-
Ticket Number
-
- ${ticket.number} +
+
Ticket Number
+
+ ${ticket.number} +
-
State
-
- +
+
State
+
+ +
-
Group
-
- ${ticket.group} +
+
Group
+
+ ${ticket.group} +
- + -
Created
-
- ${layout.format_date(ticket.created, 'relative')} +
+
Created
+
+ ${layout.format_date(ticket.created, 'relative')} +
- +
Submitter
- +
+ +
diff --git a/onegov/town/theme/styles/town.scss b/onegov/town/theme/styles/town.scss index 80ebd08..e17ba5d 100644 --- a/onegov/town/theme/styles/town.scss +++ b/onegov/town/theme/styles/town.scss @@ -334,7 +334,7 @@ form { &.read-only { background-color: $input-disabled-bg; color: $steel; - cursor: $input-disabled-cursor; + cursor: $input-disabled-cursor; } } @@ -2169,6 +2169,77 @@ ul.search-results { body { font-size: 12px !important; } + + // tickets status panel + .page-content-panel { + margin-bottom: .5rem; + + .field-display-block { + float: left; + margin-right: 1.5rem; + } + } + + .field-display-block * { + background-color: transparent; + color: $body-font-color; + font-size: 12px; + margin: 0 !important; + padding: 0; + } + + .ticket-summary { + * { + font-size: 12px; + } + + ul { + margin-bottom: 0; + } + } + + h1 { + font-size: 1.6rem; + } + + h2 { + @include hairline; + font-size: 1.2rem; + margin-bottom: .25rem; + } + + h3 { + font-size: 1.1rem; + margin-bottom: .15rem; + } + + h4, + h5, + h6 { + font-size: 1rem; + } + + .header { + max-height: 50px; + } + + .logo { + max-height: 40px; + + img, + svg { + max-height: 45px; + width: auto; + } + } + + ul.breadcrumbs { + padding: 0 0 .25rem 1rem; + + * { + font-size: 9px; + } + } } /*