From d68447ef292c81647fa4bacf29673f257161653f Mon Sep 17 00:00:00 2001 From: Julian FIOL Date: Tue, 21 Jul 2015 09:37:50 +0200 Subject: [PATCH] Bug 14608 : Add a message on the Administration page to share statistics This patch add a message on the Administration page to share your usage statistics to hea.koha-community.org If you click on : 'Yes' : It set the 'UsageStats' syspref to 1 (activate sharing) and the 'UsageStatsLastDisplay' syspref to 0. 'Later' : It set the 'UsageStats' syspref to 0 and the 'UsageStatsLastDisplay' syspref to the today's date and it will show again the message after 7 days. 'No' : It set the 'UsageStats' syspref to 0 and the 'UsageStatsLastDisplay' syspref to 0. --- admin/admin-home.pl | 30 +++++++++- installer/data/mysql/sysprefs.sql | 1 + .../intranet-tmpl/prog/en/css/staff-global.css | 9 ++- .../prog/en/modules/admin/admin-home.tt | 64 +++++++++++++++++++++ .../prog/en/modules/admin/preferences/admin.pref | 5 ++ koha-tmpl/intranet-tmpl/prog/img/later.png | Bin 0 -> 1359 bytes 6 files changed, 105 insertions(+), 4 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/later.png diff --git a/admin/admin-home.pl b/admin/admin-home.pl index b72d93d..780111b 100755 --- a/admin/admin-home.pl +++ b/admin/admin-home.pl @@ -22,8 +22,6 @@ use CGI qw ( -utf8 ); use C4::Auth; use C4::Output; - - my $query = new CGI; my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "admin/admin-home.tt", @@ -34,4 +32,32 @@ my ($template, $loggedinuser, $cookie) debug => 1, }); +# +# Usage stats sharing +# +my $usageStats = C4::Context->preference("UsageStats"); +if( $usageStats ){ + $template->param(usageStats => 1); +} +else{ + $template->param(usageStats => 0); +} + +my $DAYS = 7; #Number of days before remind to send usage stats +my $today = DateTime->now->epoch; +my $lastDisplay; +if ( (C4::Context->preference("UsageStatsLastDisplay")) eq "" ){ + $lastDisplay = 1; +} +else{ + $lastDisplay = C4::Context->preference("UsageStatsLastDisplay") / 1000; #milliseconds to seconds +} + +if( ($lastDisplay != 0) && ( $today > ($lastDisplay+ ( 60 * 60 * 24 * $DAYS)) ) ){ + $template->param(lastDisplay => $today); +} +else{ + $template->param(lastDisplay => 0); +} + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index a8efad1..c2b7e46 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -458,6 +458,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('UsageStatsLibraryName', '', NULL, 'The library name to be shown on Hea Koha community website', 'Free'), ('UsageStatsLibraryType', 'public', 'public|school|academic|research|private|societyAssociation|corporate|government|religiousOrg|subscription', 'The library type to be shown on the Hea Koha community website', 'Choice'), ('UsageStatsLibraryUrl', '', NULL, 'The library URL to be shown on Hea Koha community website', 'Free'), +('UsageStatsLastDisplay', '', NULL, 'The last time we propose you to share your statistics', 'Free'), ('UseAuthoritiesForTracings','1','0','Use authority record numbers for subject tracings instead of heading strings.','YesNo'), ('UseBranchTransferLimits','0','','If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.','YesNo'), ('UseControlNumber','0','','If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 2c4011f..d2780ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1098,7 +1098,7 @@ div.first fieldset { background : #FFF none; } -.dialog input.approve, td input.approve { +.dialog input.approve, td input.approve, button.approve { background : #FFF url(../../img/approve.gif) no-repeat 4px center; padding : .4em .4em .4em 25px; } @@ -1107,11 +1107,16 @@ td input.approve { background-color : #FFC; } -.dialog input.deny { +.dialog input.deny, button.deny { background : #FFF url(../../img/deny.gif) no-repeat 4px center; padding : .4em .4em .4em 25px; } +.dialog input.later, button.later { + background : #FFF url(../../img/later.png) no-repeat 4px center; + padding : .4em .4em .4em 25px; + } + .dialog input.save { background: #fff url(../../img/toolbar-save.gif) no-repeat 4px center; color:black; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index c85aa8e..7b8c937 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -1,6 +1,58 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration [% INCLUDE 'doc-head-close.inc' %] + [% INCLUDE 'header.inc' %] @@ -8,6 +60,18 @@ +[% IF !usageStats && lastDisplay %] +
+

You are not sharing statistics with the community yet:

+

Please share them to help us improve your user experience.

+

We are sharing data anonymously, please see which data are sent here.

+

Send stats monthly ?

+ + + +
+[% END %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 4ec683f..9b1da75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -164,3 +164,8 @@ Administration: subscription: "subscription" - will be shown on the Hea Koha community website. - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + + - + - We offered you on + - pref: UsageStatsLastDisplay + - to share your statistics with the community on the Hea Koha community website. \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/img/later.png b/koha-tmpl/intranet-tmpl/prog/img/later.png new file mode 100644 index 0000000000000000000000000000000000000000..45892ce1bd79b4212a75925e9cb409b302b026de GIT binary patch literal 1359 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%nF$y5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8v1to;s0-((bhiwcDj7L3P978H@ zwM_BWa19h`>o4x#E>Jn$TTM-Ehi0>Po+k55Mdr%X9v+`Pi+J97c+Q+@FriT*&`pnd zy^3+?6WxB!%Fp_LmxmocxN7~kxa#-+-)+9OfBn?wXANT(aa?H%n!vA9z*%;HX$CX@ zFNYb<8j?KCX#$ylG!nW$_p98KZlIweA?4G#POj?~~!l0({kIzp= zX_EefA091EcU~+!xNYZ-+&{8M-+b8qe#wp33C*2i`_}(=ns=UqBV9So=iV~;nx=@T zd;i-#m}F%i)I{w&HF?U672J{M_^vkU6!6bGx>JGI*-$=Vp_=yL*|W ztA^LprQ5zf2vJ-1_?GhmA)Sv$y_a10x$T6ccVKGwj=%CRKWzL^slYa;Io9r({Ifqo Z2@IS%Nzb+$vYi7Jah|SzF6*2UngB&f<^li! literal 0 HcmV?d00001 -- 2.4.5