[Rt-commit] rtir branch, master, updated. 4.0.1rc1-185-g60fc2373

? sunnavy sunnavy at bestpractical.com
Fri Jun 5 16:43:58 EDT 2020


The branch, master has been updated
       via  60fc23738a43af1607c629e8e34ecd746d7d527d (commit)
       via  55d66181cf6422afca937ca6aa32ba8710a51876 (commit)
       via  523557a4a6a44533c8dfaedc2429385fbae95fbb (commit)
       via  753dfa4842c05d32cc25b36a26ad029f16ed4d39 (commit)
      from  821ecd3785c12b2ed7e85ca69f2c61771dd6d7ed (commit)

Summary of changes:
 html/RTIR/Reporting/Report.html |  6 ++++
 html/RTIR/Reporting/index.html  | 12 +++----
 static/css/rtir-reporting.css   | 69 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 static/css/rtir-reporting.css

- Log -----------------------------------------------------------------
commit 753dfa4842c05d32cc25b36a26ad029f16ed4d39
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Fri May 8 14:56:26 2020 -0500

    Tweak form UI for Reporting form
    
    * Set max width to make it look nice on big screens
    * Make "Constituency" row take the whole row width
    * Fix margins of form rows

diff --git a/html/RTIR/Reporting/index.html b/html/RTIR/Reporting/index.html
index 32e7b47d..b047546d 100644
--- a/html/RTIR/Reporting/index.html
+++ b/html/RTIR/Reporting/index.html
@@ -48,9 +48,9 @@
 <& /RTIR/Elements/Header, Title => $title &>
 <& /Elements/Tabs &>
 
-<form action="index.html" method="post">
-<div class="row">
-  <div class="col-3">
+<form action="index.html" method="post" class="mx-auto max-width-sm">
+<div class="form-row">
+  <div class="col-12">
     <div class="form-row">
       <div class="label col-3">
         <&|/l&>Constituency</&>:
@@ -82,7 +82,7 @@
   </div>
 </div>
 
-<div class="row">
+<div class="form-row">
   <div class="col-12">
     <& /Elements/Submit,
         Caption => loc("Generate a delimited text report"),

commit 523557a4a6a44533c8dfaedc2429385fbae95fbb
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Wed May 27 16:34:58 2020 -0500

    Fix Reporting datepicker
    
    The datepicker for the start and end dates was not working because
    of the format of the date string being passed to Default.
    
    Setting Format to ISO fixes the string to match what the JS for
    the datepicker expects.

diff --git a/html/RTIR/Reporting/index.html b/html/RTIR/Reporting/index.html
index b047546d..04605fde 100644
--- a/html/RTIR/Reporting/index.html
+++ b/html/RTIR/Reporting/index.html
@@ -68,7 +68,7 @@
         <&|/l&>Start Date:</&>
       </div>
       <div class="value col-9">
-        <& /Elements/SelectDate, Name => 'StartDate', Default => $start->AsString &>
+        <& /Elements/SelectDate, Name => 'StartDate', Default => $start->AsString( Format => 'ISO' ) &>
       </div>
     </div>
     <div class="form-row">
@@ -76,7 +76,7 @@
         <&|/l&>End Date:</&>
       </div>
       <div class="value col-9">
-        <& /Elements/SelectDate, Name => 'EndDate', Default => $end->AsString &>
+        <& /Elements/SelectDate, Name => 'EndDate', Default => $end->AsString( Format => 'ISO' ) &>
       </div>
     </div>
   </div>

commit 55d66181cf6422afca937ca6aa32ba8710a51876
Author: Blaine Motsinger <blaine at bestpractical.com>
Date:   Wed May 27 19:43:15 2020 -0500

    Add styles for HTML format reports

diff --git a/html/RTIR/Reporting/Report.html b/html/RTIR/Reporting/Report.html
index a2212f9c..12d59db0 100644
--- a/html/RTIR/Reporting/Report.html
+++ b/html/RTIR/Reporting/Report.html
@@ -45,6 +45,12 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
+% # set styling if ReportAs is HTML.
+% if ( $ReportAs eq 'HTML' ) {
+<head>
+  <link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/static/css/rtir-reporting.css" type="text/css" media="all">
+</head>
+% }
 <%PERL>
 if ( $Constituency ){
     $m->comp("SELF:Heading$ReportAs", Text => loc('RTIR Periodic Report for [_1]', $Constituency) );
diff --git a/static/css/rtir-reporting.css b/static/css/rtir-reporting.css
new file mode 100644
index 00000000..33e7e79e
--- /dev/null
+++ b/static/css/rtir-reporting.css
@@ -0,0 +1,69 @@
+/* styles for RTIR/Reporting/Report.html */
+
+body {
+    font-family: "Inter", sans-serif;
+    font-weight: 400;
+}
+
+body, div#footer p#bpscredits a {
+    color: #31363e;
+}
+
+a {
+    text-decoration: none;
+}
+a:hover {
+    text-decoration: underline;
+}
+
+h1, h2 {
+    font-weight: 600;
+    margin: 0.25em auto;
+}
+
+h1 {
+    font-size: 1.4em;
+}
+
+h2 {
+    font-size: 1.1em;
+}
+
+table {
+    margin-bottom: 1em;
+}
+
+th {
+    text-align: left;
+}
+
+tr th {
+    font-size: 1em;
+}
+
+tr td {
+    font-size: 0.9em;
+}
+
+hr {
+    margin-top: 1.5em;
+    height: 0;
+    border: 0;
+    border-top: 1px solid #b3b8bd;
+}
+
+div#footer {
+    font-size: 0.7em;
+}
+
+div#footer p {
+    margin: 0 auto;
+}
+
+div#footer p#bpscredits {
+    margin-top: 0.1em;
+}
+
+div#footer p#time {
+    display: none;
+}

commit 60fc23738a43af1607c629e8e34ecd746d7d527d
Merge: 821ecd37 55d66181
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Jun 6 04:42:44 2020 +0800

    Merge branch '5.0/fix-reporting-layout'


-----------------------------------------------------------------------


More information about the rt-commit mailing list