From 936701aadb1084ffca75f07acb11a29914f00288 Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:21:09 +0300 Subject: [PATCH 1/3] Add new stars images for plugins rating display --- qgis-app/plugins/views.py | 2 +- qgis-app/settings_docker.py | 5 +++ .../half-and-quarter-star-16.png | Bin 0 -> 828 bytes .../jquery-ratings/half-and-quarter-star.png | Bin 0 -> 1914 bytes .../static/jquery-ratings/half-star-16.png | Bin 0 -> 859 bytes qgis-app/static/jquery-ratings/half-star.png | Bin 0 -> 1815 bytes .../static/jquery-ratings/jquery.ratings.css | 14 ++++++++ .../static/jquery-ratings/jquery.ratings.js | 32 ++++++++++++++++-- .../static/jquery-ratings/quarter-star-16.png | Bin 0 -> 825 bytes .../static/jquery-ratings/quarter-star.png | Bin 0 -> 1801 bytes 10 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 qgis-app/static/jquery-ratings/half-and-quarter-star-16.png create mode 100644 qgis-app/static/jquery-ratings/half-and-quarter-star.png create mode 100644 qgis-app/static/jquery-ratings/half-star-16.png create mode 100644 qgis-app/static/jquery-ratings/half-star.png create mode 100644 qgis-app/static/jquery-ratings/quarter-star-16.png create mode 100644 qgis-app/static/jquery-ratings/quarter-star.png diff --git a/qgis-app/plugins/views.py b/qgis-app/plugins/views.py index 8cb6adaf..d1897117 100644 --- a/qgis-app/plugins/views.py +++ b/qgis-app/plugins/views.py @@ -545,7 +545,7 @@ def get_context_data(self, **kwargs): messages.error(self.request, msg, fail_silently=True) context.update( { - "rating": int(plugin.rating.get_rating()), + "rating": plugin.rating.get_rating(), "votes": plugin.rating.votes, } ) diff --git a/qgis-app/settings_docker.py b/qgis-app/settings_docker.py index bb151b7f..1aa2d82e 100644 --- a/qgis-app/settings_docker.py +++ b/qgis-app/settings_docker.py @@ -5,6 +5,7 @@ SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) from datetime import timedelta +from django.contrib.staticfiles.storage import ManifestStaticFilesStorage DEBUG = ast.literal_eval(os.environ.get("DEBUG", "True")) THUMBNAIL_DEBUG = DEBUG @@ -31,6 +32,10 @@ # Example: "http://example.com/static/", "http://static.example.com/" STATIC_URL = "/static/" +# Manage static files storage ensuring that their +# filenames contain a hash of their content for cache busting +STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.ManifestStaticFilesStorage' + INSTALLED_APPS = [ "django.contrib.auth", "django.contrib.contenttypes", diff --git a/qgis-app/static/jquery-ratings/half-and-quarter-star-16.png b/qgis-app/static/jquery-ratings/half-and-quarter-star-16.png new file mode 100644 index 0000000000000000000000000000000000000000..09b5589b2b9419a4aed183a659d784d9eb9765f5 GIT binary patch literal 828 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⁣>-BoK%CaQSbL{1%afVq*mMhXzdpUjReO(Jr-mF)LvF}U5z+t+1(l7Jfjom%5 l8OL!n7!0@aJSWRC{slAVab)IvH%(R9J=0m|cinR~5(q`|Et%bMD97xid*KF}1~DP+N=5gHp&_ zg+S?p-^M@;wx!?{Olm_XcFJ5e5@`~32r86VQBuUT5PeY;6)IK~rs`WBnxt*oW}2C~ z-}jue_dfe;TB;m|A^A~3V>e>>yr$7%AWkz7oA-@ZRZ0MIl=fA)Y{u{ZBbx; zzHxbeety^N?5rBb@6ahLkBBql6(R}+7x}!8eCQ(#0u%~`+X{ukL&N$V3aI+zzHnlz z`f{o0As@O30tdeDAqa8^f*cBk!sCYy9SYw!pz$$rcC5l!KJOrx6L4J)*AZ}C7eNpp zpU+Q}N~Ov71?bdM2e;h1UENn6@el?MT$e#`1}-=p$3ZTaLq4BJsZ@GwdV0G2o&ufz z;e&g2OgO*aGUm`?!9^~|;RpuG2pFXhq8Ftw3{fhT%9To`TCG-ZyOA~4JZ0al?%U(J z?g>M?bEKG+iv>c81sBDFi!c=MJpsx*bdxbG)^A0lJ%Ts^q*RFG7@bZBolXaF z9M|GFo|96}Nh#;F)^jIMp1iy!(EfdU_LN8b`^zKlJ(V)wIa)?J9}?pG9FD`_xg4Iy z;QJiDCy>i=xDJC59Ds{}2b$ecD8-<43avGylt_{UQc5VLAf-f_rjSx1j^kPs zMRToIYcS5AKYy76fbZe^V17i%7QsA7!S_>&9 z7-JxWJbUikxhY_UbaW!;j!u`pmZo+D02rfi-CnwcpkR!ySa_YH9Dov7Ye8wxF3U2c zX$k<)S_42oa(~uZAMD!?R{6n?e$%-CrG_4=o0XJ?x$=fC3~nx1*~!lhUF-mCK}TUtucZYw0xAWbu5 znY|$>Yb~s`gW8Frs1LKSw6wJM)TvVoZ?{?XVmvy1_D>gI@g7)MlxQ?1qDVt81KsG? zubm`G(CKv0Xf)zlt#;pu6DM9?ZT^}!^^v2$eCCzcbH^G@iEgAJWj}529;%-%r4*7R zLA%{Htyb$x$B!TX=UO)FO2_0ke*VOjH}k)WqF&RU4pB$On3eVONVQu1?RxV!)UsCF z{v=K`v^F=~u=gX>KUqnV{Ba|j4S|f&clBNmcBmR!38l5(v1uRzbEmby&3H~)Yc~Yi zu*qlK-cATW@V`s3pEYYOOlD!yUVUXILzZPAWc7VgN;hmpHUx5now#1V0AqSrK$=>p z6o?XyB$kj;!ekbV@quLYHEnrpK0=O@jWWtX2tk%vXx)QR+CZrcabnPHM`$$LNR$f; z502x4^Bz?H5Kv0NIll=&!sG!CW3qvSNNEto8c}2rMFfpDF^!IIR7xF6eR!S^*LC4I z&Oqsxb#3!0V^lk-5r~r%7QHunx2w_aC^TCs7Hi>Lv#r0N(nV>lKFURKFbD!am&?KP zJTS%vjTwN6$;nA}`t)hD)_Us#O&$5{u8)3LqucGZ3$&#ml|iGa?bWy3mud~MU(ibz zl;(XLC$Tsf$DZ+3;R{{{`KPzCyVaQ_27U002ovPDHLk FV1kBzVHW@Z literal 0 HcmV?d00001 diff --git a/qgis-app/static/jquery-ratings/jquery.ratings.css b/qgis-app/static/jquery-ratings/jquery.ratings.css index 9c9cdbf4..cc55d031 100644 --- a/qgis-app/static/jquery-ratings/jquery.ratings.css +++ b/qgis-app/static/jquery-ratings/jquery.ratings.css @@ -11,3 +11,17 @@ .jquery-ratings-full { background-image: url('full-star-16.png'); } + + +.jquery-ratings-quarter { + background-image: url('quarter-star-16.png'); +} + +.jquery-ratings-half { + background-image: url('half-star-16.png'); +} + +.jquery-ratings-half-and-quarter { + background-image: url('half-and-quarter-star-16.png'); +} + diff --git a/qgis-app/static/jquery-ratings/jquery.ratings.js b/qgis-app/static/jquery-ratings/jquery.ratings.js index 3d5a2a77..30519668 100644 --- a/qgis-app/static/jquery-ratings/jquery.ratings.js +++ b/qgis-app/static/jquery-ratings/jquery.ratings.js @@ -42,8 +42,21 @@ jQuery.fn.ratings = function(stars, initialRating) { star.addClass('jquery-ratings-star'); //Add the full css class if the star is beneath the initial rating. + // The last star will depend on the decimal left if(starIdx < initialRating) { - star.addClass('jquery-ratings-full'); + let ratingDiff = initialRating - starIdx + if (ratingDiff > 0 && ratingDiff <= 0.3) { + star.addClass('jquery-ratings-quarter'); + } + else if (ratingDiff > 0.3 && ratingDiff <= 0.6) { + star.addClass('jquery-ratings-half'); + } + else if (ratingDiff > 0.6 && ratingDiff <= 0.9) { + star.addClass('jquery-ratings-half-and-quarter'); + } + else { + star.addClass('jquery-ratings-full'); + } } //add the star to the container @@ -65,13 +78,28 @@ jQuery.fn.ratings = function(stars, initialRating) { //Unhighlight unselected stars. for(var index = this.rating; index < stars; index++) { starsCollection[index].removeClass('jquery-ratings-full'); + starsCollection[index].removeClass('jquery-ratings-half-and-quarter'); + starsCollection[index].removeClass('jquery-ratings-half'); + starsCollection[index].removeClass('jquery-ratings-quarter'); } }); container.mouseleave(function() { //Highlight selected stars. for(var index = 0; index < containerElement.rating; index++) { - starsCollection[index].addClass('jquery-ratings-full'); + let ratingDiff = containerElement.rating - index + if (ratingDiff > 0 && ratingDiff <= 0.3) { + starsCollection[index].addClass('jquery-ratings-quarter'); + } + else if (ratingDiff > 0.3 && ratingDiff <= 0.6) { + starsCollection[index].addClass('jquery-ratings-half'); + } + else if (ratingDiff > 0.6 && ratingDiff <= 0.9) { + starsCollection[index].addClass('jquery-ratings-half-and-quarter'); + } + else { + starsCollection[index].addClass('jquery-ratings-full'); + } } //Unhighlight unselected stars. for(var index = containerElement.rating; index < stars ; index++) { diff --git a/qgis-app/static/jquery-ratings/quarter-star-16.png b/qgis-app/static/jquery-ratings/quarter-star-16.png new file mode 100644 index 0000000000000000000000000000000000000000..edbada17611ce0db876f597ff25870865972fd9b GIT binary patch literal 825 zcmV-91IGM`P)q$gGR5*=gl1*_OM{XhX6q(*4^;~_yb5}0TQSpQYoOQ7K8?x1k$*6X2$WycxLXsEJEEB zUg_*!J$lbMuXuCwNmg4G>Ptm_{OOp%V2bTXv@#r@tgL}xX<`2+=QO|g3jKbc{r!C` z0AmbFX;#~FXl+mm(o~T!zmBQbzOYl zCrwi(lL<hW|=yO_C%W930T;blxA0MjzO= zJ&{@)Y+EuJAH8sGJN~uT8zV3XAs+ZUKp2MX?(SZVqUb%#vM|PAEjLQ!q(BG=!tCXv z?s%_UO_5U0t}UfRDMi2E*TdoP?P9SwOC<}wh2!LqQjliyIjuAx5kmZLlv2_dvuaru z`FtMV_pv9n+S zGrf9nIC%BZrR!UE?vHD?{y1~Ig=Kre6MKV#ml%uSB$$l@CL%0@Z6aKF z$oKsxeBZyzbzO{F5Cn@s5FGzZfmT;n%^(QYJkNvcx^Nr^j^m6%J-fQP>P=g(Y1+^} z6`*>}UG;r`-gRAAmIc!^VVWi^%Yy5=@O^(i48!GV>n+QIVHluvJcMTkT7T*LVXYpX z3<4jH=UazB8t04%2u|2eDS@h-R zu_Lyn9d#?(gPy1EuKIdNjgaIx0G-UkFaucD$3Os36a|D3;GBaohA4^QZy!Zk%y#h)N5JHB*sgxQ*m0)R_f^&{6%fLBDp64ZSJ4uqQe!oAo3l}b2qyXU9 z_|g7G^0m+H*RXGnpk8<2dnO!*!ZdW4CWWS3;KGF-RlqU}3I;T7{KPd)8>&VKfoYn^ z^Bj4eLkKYhN|L1B@An^4Nmp%(em(@4&=ytAa`?^ZHE4UBVjqROhOiuo2@&I(Lhhr6mcA**XyCv z>Ac(NbRIr?_H1u-{#aD5y?E}Q|9YQ3a`jqPv|1?!gA6H`$nyfKP?&{DDFvkzq?E|A z3`vrdFgIGQ)+6n9`^K$nCML$`)_(QJ_b%B_+_=fn?QtZDfXE9J#q0`|v6H4Lq9{VQ z+hy%``|F)f=iOefH#UE2ratxDTW?Z1_Rme_rKNc zcK_b*_YueOe-8uz%TN9Ch0Fi;f1M=TO?xg2%&L);ax{LPY&M&}kD>^19D^}78xR2W z2kNIR6%azADAcYLDsNVrrhfnc#uzx~!|Oj2kd)$nDYxTC?IMOop@a|%0EQX6D2myE zG{`S0g_)0P3fw{oIc?mr$tP4D(6pVLtPLFxZFGatEIn!Hx<1y5%nW22YMu}sy8dz2 zE#&qQNLdVzWM@NYng&A1uw<0)JGKDe6CJ|rKxWY(y0KlG3WZ$k1Sr=aM7{$iQEpUL zcuKbmaH-x-!CfeyOWTD)(gzGkSwJcYmU6^#j3|~!Q(gur0{}{?V;BZ(+aC7XMNvRX zS=P11Ju5_XVdl~RO9iA#(d`bK9nmSqc4$}7{Z{_TO%^uA7)BT1D?GwaWB zoPB%!%&V72=REf4J&i=tAY@LaP^3-k1~YhQVVQhGuuwahuMrfGUW2=Pua zr7qqUXfR-NmkZ;s(CK$x|JnKXCe7&&vSAmX>l%zSN0Jc4vA`h8;Mjj_Q$k+&sCCyy ro{Oi`ls7o%kWx+rn)(^^zZ(AmomaOTT8M|e00000NkvXXu0mjfbYxJ` literal 0 HcmV?d00001 From 96ef72a5f634e1a286d10fb72ad0391a53298bf9 Mon Sep 17 00:00:00 2001 From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com> Date: Tue, 13 Feb 2024 20:23:14 +0300 Subject: [PATCH 2/3] New version of jquery ratings --- qgis-app/plugins/templates/plugins/plugin_detail.html | 4 ++-- qgis-app/static/jquery-ratings/example.html | 4 ++-- .../{jquery.ratings.css => jquery.ratings.1.0.css} | 0 .../{jquery.ratings.js => jquery.ratings.1.0.js} | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) rename qgis-app/static/jquery-ratings/{jquery.ratings.css => jquery.ratings.1.0.css} (100%) rename qgis-app/static/jquery-ratings/{jquery.ratings.js => jquery.ratings.1.0.js} (90%) diff --git a/qgis-app/plugins/templates/plugins/plugin_detail.html b/qgis-app/plugins/templates/plugins/plugin_detail.html index 82ac70c9..a2ffcc37 100644 --- a/qgis-app/plugins/templates/plugins/plugin_detail.html +++ b/qgis-app/plugins/templates/plugins/plugin_detail.html @@ -4,7 +4,7 @@ {% block extrajs %} {{ block.super }} - + {% endblock %} {% block extracss %} - + {{ block.super }}