[Bps-public-commit] RT-Extension-ActivityReports branch, master, updated. 1.06-10-g9f6acb1
Jim Brandt
jbrandt at bestpractical.com
Tue Aug 9 14:30:07 EDT 2016
The branch, master has been updated
via 9f6acb1459dfaf3fa6a41a91efb61a9c6322e5ed (commit)
via 730d9c45c82b2903de148b4e08980c93fca725b6 (commit)
via 1f4fae54c6d3fdb0817b6fe50eb705fefa73143a (commit)
from e41146c485edc964d6142c29fdd9a201cfb62087 (commit)
Summary of changes:
Changes | 7 ++++++
MANIFEST | 5 ++--
META.yml | 3 ++-
.../Callbacks/ActivityReports/Elements/Header/Head | 1 -
.../Default => NoAuth/css/activity-reports.css} | 1 +
inc/Module/Install/RTx.pm | 27 +++++++++++++++++++---
lib/RT/Extension/ActivityReports.pm | 4 +++-
.../style.css => static/css/activity-reports.css | 4 ----
8 files changed, 39 insertions(+), 13 deletions(-)
delete mode 100644 html/Callbacks/ActivityReports/Elements/Header/Head
rename html/{Callbacks/ActivityReports/NoAuth/webrt.css/Default => NoAuth/css/activity-reports.css} (99%)
rename html/Reports/Activity/style.css => static/css/activity-reports.css (94%)
- Log -----------------------------------------------------------------
commit 1f4fae54c6d3fdb0817b6fe50eb705fefa73143a
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Tue Aug 9 11:39:25 2016 -0400
Move css file to standard locations for 4.0 and 4.2
diff --git a/html/Callbacks/ActivityReports/Elements/Header/Head b/html/Callbacks/ActivityReports/Elements/Header/Head
deleted file mode 100644
index d54aa01..0000000
--- a/html/Callbacks/ActivityReports/Elements/Header/Head
+++ /dev/null
@@ -1 +0,0 @@
-<LINK REL="StyleSheet" HREF="<%$RT::WebPath%>/Reports/Activity/style.css" TYPE="text/css" MEDIA="screen">
diff --git a/html/Callbacks/ActivityReports/NoAuth/webrt.css/Default b/html/NoAuth/css/activity-reports.css
similarity index 99%
rename from html/Callbacks/ActivityReports/NoAuth/webrt.css/Default
rename to html/NoAuth/css/activity-reports.css
index 4037975..79db788 100644
--- a/html/Callbacks/ActivityReports/NoAuth/webrt.css/Default
+++ b/html/NoAuth/css/activity-reports.css
@@ -68,3 +68,4 @@ table.numberreport td {
padding: 0 1em;
text-align: right;
}
+
diff --git a/lib/RT/Extension/ActivityReports.pm b/lib/RT/Extension/ActivityReports.pm
index 6b53990..b3c54dd 100644
--- a/lib/RT/Extension/ActivityReports.pm
+++ b/lib/RT/Extension/ActivityReports.pm
@@ -3,7 +3,9 @@ package RT::Extension::ActivityReports;
use Exporter qw( import );
@EXPORT_OK = qw( RelevantTxns );
-our $VERSION = '1.07';
+our $VERSION = '1.08';
+
+RT->AddStyleSheets('activity-reports.css');
=head1 NAME
diff --git a/html/Reports/Activity/style.css b/static/css/activity-reports.css
similarity index 94%
rename from html/Reports/Activity/style.css
rename to static/css/activity-reports.css
index a41b111..79db788 100644
--- a/html/Reports/Activity/style.css
+++ b/static/css/activity-reports.css
@@ -69,7 +69,3 @@ table.numberreport td {
text-align: right;
}
-<%init>
-RT::Interface::Web::StaticFileHeaders();
-$r->content_type('text/css');
-</%init>
commit 730d9c45c82b2903de148b4e08980c93fca725b6
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Tue Aug 9 11:39:50 2016 -0400
Module::Install update
diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index 97acf77..cb4cfde 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -37,6 +37,13 @@ sub RTx {
}
$self->add_metadata("x_module_install_rtx_version", $VERSION );
+ my $installdirs = $ENV{INSTALLDIRS};
+ for ( @ARGV ) {
+ if ( /INSTALLDIRS=(.*)/ ) {
+ $installdirs = $1;
+ }
+ }
+
# Try to find RT.pm
my @prefixes = qw( /opt /usr/local /home /usr /sw /usr/share/request-tracker4);
$ENV{RTHOME} =~ s{/RT\.pm$}{} if defined $ENV{RTHOME};
@@ -71,7 +78,13 @@ sub RTx {
# Installation locations
my %path;
- $path{$_} = $RT::LocalPluginPath . "/$name/$_"
+ my $plugin_path;
+ if ( $installdirs && $installdirs eq 'vendor' ) {
+ $plugin_path = $RT::PluginPath;
+ } else {
+ $plugin_path = $RT::LocalPluginPath;
+ }
+ $path{$_} = $plugin_path . "/$name/$_"
foreach @DIRS;
# Copy RT 4.2.0 static files into NoAuth; insufficient for
@@ -85,7 +98,7 @@ sub RTx {
my %index = map { $_ => 1 } @INDEX_DIRS;
$self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS;
- my $args = join ', ', map "q($_)", map { ($_, $path{$_}) }
+ my $args = join ', ', map "q($_)", map { ($_, "\$(DESTDIR)$path{$_}") }
sort keys %path;
printf "%-10s => %s\n", $_, $path{$_} for sort keys %path;
@@ -131,6 +144,7 @@ install ::
if ( $path{lib} ) {
$self->makemaker_args( INSTALLSITELIB => $path{'lib'} );
$self->makemaker_args( INSTALLARCHLIB => $path{'lib'} );
+ $self->makemaker_args( INSTALLVENDORLIB => $path{'lib'} )
} else {
$self->makemaker_args( PM => { "" => "" }, );
}
@@ -139,6 +153,13 @@ install ::
$self->makemaker_args( INSTALLSITEMAN3DIR => "$RT::LocalPath/man/man3" );
$self->makemaker_args( INSTALLSITEARCH => "$RT::LocalPath/man" );
+ # INSTALLDIRS=vendor should install manpages into /usr/share/man.
+ # That is the default path in most distributions. Need input from
+ # Redhat, Centos etc.
+ $self->makemaker_args( INSTALLVENDORMAN1DIR => "/usr/share/man/man1" );
+ $self->makemaker_args( INSTALLVENDORMAN3DIR => "/usr/share/man/man3" );
+ $self->makemaker_args( INSTALLVENDORARCH => "/usr/share/man" );
+
if (%has_etc) {
print "For first-time installation, type 'make initdb'.\n";
my $initdb = '';
@@ -258,4 +279,4 @@ sub _load_rt_handle {
__END__
-#line 390
+#line 428
commit 9f6acb1459dfaf3fa6a41a91efb61a9c6322e5ed
Author: Jim Brandt <jbrandt at bestpractical.com>
Date: Tue Aug 9 14:29:01 2016 -0400
Updates for 1.08 release
diff --git a/Changes b/Changes
index ec26bd2..72088a8 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,10 @@
+1.08 2016-08-09
+ - Update style sheet locations and method call to load. Previous
+ code manually loading css in Head could cause insecure content
+ warnings for https in Firefox. To remove the warnings, you need
+ to delete the old files under local/plugins/RT-Extension-ActivityReports
+ before installing the new version.
+
1.07 2016-05-17
- Release version for RT 4.4
diff --git a/MANIFEST b/MANIFEST
index 73d0be3..2bac22f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,9 +1,8 @@
Changes
-html/Callbacks/ActivityReports/Elements/Header/Head
html/Callbacks/ActivityReports/Elements/Tabs/Default
html/Callbacks/ActivityReports/Elements/Tabs/Privileged
-html/Callbacks/ActivityReports/NoAuth/webrt.css/Default
html/Callbacks/ActivityReports/Search/Results.html/SearchActions
+html/NoAuth/css/activity-reports.css
html/Reports/Activity/ActivityDetail.html
html/Reports/Activity/ActivitySummary.html
html/Reports/Activity/Elements/ActivityDetail
@@ -22,7 +21,6 @@ html/Reports/Activity/Elements/Wrapper
html/Reports/Activity/index.html
html/Reports/Activity/ResolutionComments.html
html/Reports/Activity/ResolutionStatistics.html
-html/Reports/Activity/style.css
html/Reports/Activity/WorkedStatistics.html
html/Search/ActivityReport.html
html/Search/Elements/ActivityReport
@@ -44,3 +42,4 @@ Makefile.PL
MANIFEST This list of files
META.yml
README
+static/css/activity-reports.css
diff --git a/META.yml b/META.yml
index cdee8fe..09d75c9 100644
--- a/META.yml
+++ b/META.yml
@@ -18,12 +18,13 @@ no_index:
directory:
- html
- inc
+ - static
requires:
Time::Duration: 0
perl: 5.8.3
resources:
license: http://dev.perl.org/licenses/
-version: '1.07'
+version: '1.08'
x_module_install_rtx_version: '0.37'
x_requires_rt: 4.0.0
x_rt_too_new: 4.6.0
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list