From 42eabc9ccedd38f60ebf7614aad90c49c725743b Mon Sep 17 00:00:00 2001 From: tankchintan Date: Mon, 18 Jul 2011 20:04:06 +0000 Subject: [PATCH] 1. new icons for map of science & temporal vis. --- .../visualization/mapofscience/vivo-scimap.png | Bin 0 -> 1348 bytes .../temporalgraph/temporal-drill-down.png | Bin 0 -> 959 bytes .../temporalgraph/temporal-drill-up.png | Bin 0 -> 923 bytes .../js/visualization/entitycomparison/util.js | 2 +- .../mapofscience/DataTableWidget.js | 2 -- .../individual-visualizationFoafPerson.ftl | 2 +- .../individual-visualizationMapOfScience.ftl | 2 +- .../entitycomparison/entityComparisonSetup.ftl | 4 +++- .../mapOfScience/mapOfScienceSetup.ftl | 2 +- .../mapOfScience/mapOfScienceStandalone.ftl | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 productMods/images/visualization/mapofscience/vivo-scimap.png create mode 100644 productMods/images/visualization/temporalgraph/temporal-drill-down.png create mode 100644 productMods/images/visualization/temporalgraph/temporal-drill-up.png diff --git a/productMods/images/visualization/mapofscience/vivo-scimap.png b/productMods/images/visualization/mapofscience/vivo-scimap.png new file mode 100644 index 0000000000000000000000000000000000000000..f2ce3c3afba4d14ed4721d5252cc9cd63e1fb345 GIT binary patch literal 1348 zcmex=iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgTaWwh?!B4fk}{&S&;Gn5r!HD z1|}wEMn<4Jp@5a0g^d9y#KDLx3YKIPU|?coVqs=s<>Z9uU}RzzWMNPgVl{MR3sf=^ zPAqH`VGl|&Zr*GXB5L+wqf^nP#imom#04=7V-);3aF~T|14uRpRz8&s&ia=`Qic_Wp|J8TU?i{bKue)1By> zS-q=_rxiG|wMKehF|ZUUke&VTy{D*RPEU?|>9xpJ%eRD{IG|Ji+N%BIroZgFEBc$a z|J+wD!>qjMeZr;}+14{p3ND{LscW<0+(WDSa*it)ux@+1%ai5$>?v8-%exmoG%4wl z3*d9#dj6xls{!}Eb+^~2?w)o@dw2V!bFTe4x3yRNOlw=kaP7JA(w!O$9~1^w-pG;9 zx_PId zyX%{FhW9a~9ZubQ=Z$z+txLq|qSUUIV<`ewtP3+7VZLySi)DOZ&2SChW|ZvAA`+ zC-=IA_e4u#jw^RCe!cEz{?tJ4b{6jvzDxI(~+%{x)tY| zUaNZ{)h^4KCC^b?$W0|c!8&@CV2=`o? zD51ToEA&R!l`gqkPu;ieF1^|?x#CV}V&5@KmF?TFNSaW_R?Wqn}4s5uDFohdw8uc zzv%%N@9MwDUTJRUF3ir%DLtAIo06#}Bj>a=R`aN9#j^??#u|3%+abF*&%5RnX5Dd5 zJ@sTmsg}o==M9{fthwKWh0pt{UgbHrTUM({udTe>H7%+;2bk(_RZk37!LK%m&ixy%mLWdUAJ|{r|fE=)e7{K>q(t0GhWP AApigX literal 0 HcmV?d00001 diff --git a/productMods/images/visualization/temporalgraph/temporal-drill-down.png b/productMods/images/visualization/temporalgraph/temporal-drill-down.png new file mode 100644 index 0000000000000000000000000000000000000000..cb405f7310e5f63a01d6299e540a792b78766114 GIT binary patch literal 959 zcmV;w13>(VP)SkRk*;gdl_vFFf(UW8cGn$UA?c{S~G31pz`pDFol*l#2ralG4~FIF2v7 zc4sDbxx}fUD;=HHIdi_5Z|0kGl)1UHx}qoxeSLk42M!Dw?RFdA^U+yUDj!iUmw&cx z`|~GAP|JZ;kcxc2antBLaWu1gUx0WTU#ISbZH5hR0=0fp2Vrs zXJo$%q6!lQwb~9!r4mw0Pq4C*XTWi$+-3tlu(|m+^2<47(rIjWB3sVoaCkI;Xex_S|!^}8!5n@DqbXGKpu;{)EO<->j_(82=9s55qL02uDn0vuR{AY1!kM^Tv@| zmMt?EA{LM1$mA5fUN2s)u0kj?kk98MkO-!xrV$E9{F}os771*F=SJ|%M`O;&!Ty9zCF7o>il89AmRf@8OZv(VQsKX@WnVI7xj2BV35RY_oS@umkSnrC>*9jOmwPVN35d+()zwPkh;roZ<0Cr9*+mf@p0)I zZn25UNeohznL$r5Rds0Osk*aMqi)dmc;%{^riu7iLT;c?IJBpLp9iqM{x0tbha=8% zxp+AqACo(gqwNmyN;;*RTw0OE{OQj8WXGy_aQ{Bm)?WXl@Do6xE({F~EqcAa|M>(| h=m{vv6Y!4!0|1@3n`b=l9U1@t002ovPDHLkV1id<#Z~|S literal 0 HcmV?d00001 diff --git a/productMods/images/visualization/temporalgraph/temporal-drill-up.png b/productMods/images/visualization/temporalgraph/temporal-drill-up.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f2c9889f6220e4c8291b2c1bb5b1c84a62642c GIT binary patch literal 923 zcmV;M17!S(P)b!e)#|Naz9|@rqM)m*>sAb3^;%7vpa1ec5)P-8wzjtC6B84tR4P*4&6~k; zxh#HsUx0UYg%@&`+i{d^`sp)hn)X`h?Y%#wsA|)8xT<(8jzm0;;O-70kqERVu?*VY zZsY1aJgP{#X4R&_6 zsNxvZ79B}f%?5eFejbD{z1~24ond|5k4PwlXf#4R7NF7iNKOcoc$`SPS+apLU7TOQzviQW5cc=>sl6O2Y?LHE?+SW)df^ywNXzk96dM~q z5sOAeFm?iOJz0>=X0h&HLns);;o*V!jT0z}N(z?*@Z{tee!o}#$EfN^B#d-AEyY}M zSfWYq>N0k=w~wkevHy?IXpPP`T4mB#Xw9)zheNYWD**G zrIRT>F`$yScrou;w|f+WLr&Pc?N8-bI%G;2Nyy&pB??>~5BmH2G56^sRY>ZI zr=+49Mn+t4j<{j7*U2#F@=z5r~zyT5VTGXAV^k7^VrgXH1SL zqp_WhBgFH?^A3jtznxAjEiS@6=D{dc)!BJh=;5Rs!@HJ%wZMy)uZHj0?ZOcQ{e52W z0=9(9SMy}blX)I!7fjf3^(%?mlkYPDX1UB@!#3*WwS xM{~OCSAd0H0eAlE6+m_>lIk'); + labelDiv.append(''); } diff --git a/productMods/js/visualization/mapofscience/DataTableWidget.js b/productMods/js/visualization/mapofscience/DataTableWidget.js index 8d36a7b9..4471eecb 100644 --- a/productMods/js/visualization/mapofscience/DataTableWidget.js +++ b/productMods/js/visualization/mapofscience/DataTableWidget.js @@ -237,7 +237,6 @@ var DataTableWidget = Class.extend({ } me.currentSelectedFilter = SCIMAP_TYPE.SUBDISCIPLINE; $("a#csv").attr("href", entityMapOfScienceSubDisciplineCSVURL); - $("a#csv").html("Export All Sub-Disciplines"); } else { @@ -247,7 +246,6 @@ var DataTableWidget = Class.extend({ me.widget.fnSettings()._iDisplayLength = 13; } $("a#csv").attr("href", entityMapOfScienceDisciplineCSVURL); - $("a#csv").html("Export All Disciplines"); } diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl index 356c759b..5faf712b 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl @@ -18,7 +18,7 @@
<#if isAuthor> <#assign coAuthorIcon = "${urls.images}/visualization/co_author_icon.png"> - <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo_scimap.jpg"> + <#assign mapOfScienceIcon = "${urls.images}/visualization/mapofscience/vivo-scimap.png"> <#assign coAuthorVisUrl = individual.coAuthorVisUrl> <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl index a1b4473a..3198681e 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl @@ -3,5 +3,5 @@ <#-- Map Of Science visualization --> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index f85e85df..3c54e22e 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -29,7 +29,8 @@ <#assign organizationPublicationTemporalGraphDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=entity_comparison&uri=${organizationURI}&vis_mode=json"> <#assign organizationGrantTemporalGraphDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}&vis_mode=json"> -<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> +<#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporalgraph/temporal-drill-up.png'> +<#assign temporalGraphDrillDownIcon = '${urls.images}/visualization/temporalgraph/temporal-drill-down.png'> <#assign temporalGraphDownloadCSVCommonURL = '${urls.base}${dataVisualizationURLRoot}?uri=${organizationURI}&labelField=label'> @@ -101,6 +102,7 @@ ${stylesheets.add(' -<#assign mapOfScienceIcon = '${urls.images}/visualization/mapofscience/vivo_scimap.jpg'> +<#assign mapOfScienceIcon = '${urls.images}/visualization/mapofscience/vivo-scimap.png'> <#assign entityMapOfScienceDataURL = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&uri=${entityURI}&output=json"> <#assign entityMapOfScienceDisciplineCSVURL = "${urls.base}${dataVisualizationURLRoot}?vis=${mapOfScienceVisParam}&uri=${entityURI}&output=csv&vis_mode=discipline"> diff --git a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl index 1fcdb936..c341d260 100644 --- a/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl +++ b/productMods/templates/freemarker/visualization/mapOfScience/mapOfScienceStandalone.ftl @@ -56,7 +56,7 @@ corresponding changes in the included Templates. -->