[Bps-public-commit] RT-Extension-FeaturedTickets branch, master, updated. 3488c9a7eb747df38c5b640ab40fc831ba064330

Jim Brandt jbrandt at bestpractical.com
Thu May 24 17:07:24 EDT 2018


The branch, master has been updated
       via  3488c9a7eb747df38c5b640ab40fc831ba064330 (commit)
       via  dfea003ed2989d1affc546f13cb2c736d3f50524 (commit)
       via  6ff75e6957e1cfa69ffe3daf37dfbe9e93a77b57 (commit)
      from  dc9b1e903074353889c47399deb9d3080ac90ca6 (commit)

Summary of changes:
 etc/initialdata                 |  2 ++
 html/NoAuth/Featured/index.html | 63 +++++++++++++++++++++++++----------------
 static/css/featured-tickets.css | 20 ++++++++++++-
 3 files changed, 59 insertions(+), 26 deletions(-)

- Log -----------------------------------------------------------------
commit 6ff75e6957e1cfa69ffe3daf37dfbe9e93a77b57
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu May 24 15:57:33 2018 -0400

    Remove return statements and add check for queue

diff --git a/html/NoAuth/Featured/index.html b/html/NoAuth/Featured/index.html
index 104ede2..e02c3b7 100644
--- a/html/NoAuth/Featured/index.html
+++ b/html/NoAuth/Featured/index.html
@@ -159,25 +159,34 @@ Header image courtesy of <a href='https://unsplash.com/@rawpixel'>@rawpixel</a>
 <%init>
 my $queue = RT::Queue->new(RT->SystemUser);
 my ($ret, $msg) = $queue->Load(RT->Config->Get('FeaturedTicketsQueue'));
-return ($ret, $msg) unless $ret;
 
-my $tickets = RT::Tickets->new(RT->SystemUser);
-($ret, $msg) = $tickets->LimitQueue( VALUE => $queue->Name );
-return ($ret, $msg) unless $ret;
-
-my @statuses = RT->Config->Get('FeaturedTicketStatuses');
+RT::Logger->error("Unable to load Feature Tickets Queue "
+    . RT->Config->Get('FeaturedTicketsQueue') . " $msg") unless $ret;
 
-for my $status (@statuses) {
-    $tickets->LimitStatus( VALUE => $status->[0]);
+my $tickets = RT::Tickets->new(RT->SystemUser);
+if ( $queue->Id ){
+    $tickets->LimitQueue( VALUE => $queue->Id );
+
+    my $statuses = RT->Config->Get('FeaturedTicketStatuses');
+
+    foreach my $status (@$statuses) {
+        $tickets->LimitStatus( VALUE => $status );
+    }
+
+    # Limit feature to RT or RTIR, if provided
+    $tickets->LimitCustomField(
+        CUSTOMFIELD => 'Feature Type',
+        OPERATOR    => '=',
+        VALUE       => $feature_type,
+        QUEUE       => $queue->Id,
+    );
+}
+else{
+    # If we didn't load a feature ticket queue, don't show anything
+    RT::Logger->error("Unable to load featured tickets. Did you set \$FeaturedTicketsQueue in RT_SiteConfig.pm?");
+    $tickets->FromSQL('id=0');
 }
 
-($ret, $msg) = $tickets->LimitCustomField(
-    CUSTOMFIELD => 'Feature Type',
-    OPERATOR    => 'LIKE',
-    VALUE       => $feature_type,
-    QUEUE       => $queue,
-);
-return ($ret, $msg) unless $ret;
 </%init>
 
 <%args>

commit dfea003ed2989d1affc546f13cb2c736d3f50524
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu May 24 16:10:57 2018 -0400

    Add new Partially Funded ribbon

diff --git a/etc/initialdata b/etc/initialdata
index 91405e2..9c6434d 100644
--- a/etc/initialdata
+++ b/etc/initialdata
@@ -16,7 +16,9 @@ our @Queues = ({
          Description =>'If The Goal Has Been Met',
          ApplyTo     => $QueueName,
          Values      => [
+             { Name => 'Unfunded' },
              { Name => 'Funded' },
+             { Name => 'Partially Funded' },
          ],
     },
     {
diff --git a/html/NoAuth/Featured/index.html b/html/NoAuth/Featured/index.html
index e02c3b7..18a9d33 100644
--- a/html/NoAuth/Featured/index.html
+++ b/html/NoAuth/Featured/index.html
@@ -91,6 +91,12 @@
     <div class='ribbon-wrapper'>
         <div class='ribbon'>Funded!</div>
     </div>
+%   }
+%   if ( $ticket->FirstCustomFieldValue('Funded')
+%        && $ticket->FirstCustomFieldValue('Funded') eq 'Partially Funded' ) {
+    <div class='ribbon-wrapper'>
+        <div class='ribbon'>Partially Funded!</div>
+    </div>
 %   }
     <p>
 % if ( length($ticket->FirstCustomFieldValue('Description')) > 140 ) {

commit 3488c9a7eb747df38c5b640ab40fc831ba064330
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu May 24 17:07:13 2018 -0400

    Add FAQ text and some style

diff --git a/html/NoAuth/Featured/index.html b/html/NoAuth/Featured/index.html
index 18a9d33..57cdf18 100644
--- a/html/NoAuth/Featured/index.html
+++ b/html/NoAuth/Featured/index.html
@@ -116,38 +116,36 @@
     <div class="information pure-g">
         <div class="pure-u-1 pure-u-md-1-2">
             <div class="l-box">
-                <h3 class="information-head">Get started today</h3>
+                <h3 class="information-head">What is this page?</h3>
                 <p>
-                    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.
+                    As an open source product, the majority of the new features we add to Request Tracker are sponsored by users just like you. When we talk to organizations who use RT, we often share our product roadmap to provide options for sponsorship in the core product. We wanted to find a way to share these product ideas with a wider audience, so we created this page to make it easier for supporters to see new features we'd like to build into RT and RTIR.
                 </p>
             </div>
         </div>
 
         <div class="pure-u-1 pure-u-md-1-2">
             <div class="l-box">
-                <h3 class="information-head">Pay monthly or annually</h3>
+                <h3 class="information-head">When can I have it?</h3>
                 <p>
-                    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ullamco laboris nisi ut aliquip ex ea commodo
-                    consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse.
+                     Smaller features and bug fixes are included in the next point release in the current stable release. For larger features, we typically target the next minor series, and we can also provide you with an extension that is compatible with the current stable release. (Versions consist of a major series, minor series and point release. RT 4.4.2 is major series 4, minor series 4, and point release 2.) 
                 </p>
             </div>
         </div>
 
         <div class="pure-u-1 pure-u-md-1-2">
             <div class="l-box">
-                <h3 class="information-head">24/7 customer support</h3>
+                <h3 class="information-head">What happens after I sponsor?</h3>
                 <p>
-                    Cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+                    Once you sign up to sponsor a feature, we'll be in touch to discuss our development process, scheduling, payment, and answer any other questions you have. 
                 </p>
             </div>
         </div>
 
         <div class="pure-u-1 pure-u-md-1-2">
             <div class="l-box">
-                <h3 class="information-head">Cancel your plan anytime</h3>
+                <h3 class="information-head">My feature isn't here</h3>
                 <p>
-                    Duis aute irure dolor in reprehenderit in voluptate velit esse
-                    cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                    We offer a wide variety of <a href="https://bestpractical.com/services">services</a> for RT, including <a href="https://bestpractical.com/support">product support</a>, <a href="https://bestpractical.com/training">training</a>, and <a href="https://bestpractical.com/services/">development</a>. If you'd like to sponsor the development of a feature not included here, or are seeking joint sponsorship of a feature for RT, please <a href="mailto:contact at bestpractical.com">contact us</a>.
                 </p>
             </div>
         </div>
diff --git a/static/css/featured-tickets.css b/static/css/featured-tickets.css
index dc6bda0..61a06ee 100644
--- a/static/css/featured-tickets.css
+++ b/static/css/featured-tickets.css
@@ -3,7 +3,7 @@
  * Most of these are inherited from Base, but I want to change a few.
  */
  .featured-tickets-body {
-    color: black;
+/*    color: black;  */
     background: #FAFAFA;
 }
 
@@ -49,6 +49,24 @@
     padding: .5em .7em;
 }
 
+h2, h3 {
+    letter-spacing: 0.25em;
+    text-transform: uppercase;
+    font-weight: 600;
+}
+
+p {
+    line-height: 1.6em;
+}
+
+body {
+    color: #526066;
+}
+
+.information-head {
+    color: black;
+    font-weight: 500;
+}
 
 /*
  * -- BANNER --

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


More information about the Bps-public-commit mailing list