Changeset 684
- Timestamp:
- 12/05/12 15:39:44 (11 years ago)
- Location:
- ether_statistics
- Files:
-
- 10 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
ether_statistics/Statistics.ipr
r660 r684 5 5 </component> 6 6 <component name="ArtifactManager"> 7 <artifact type="exploded-war" build-on-make="true" name="statistics"> 8 <output-path>$PROJECT_DIR$/web</output-path> 9 <root id="root" /> 7 <artifact type="war" build-on-make="true" name="statistics"> 8 <output-path>$PROJECT_DIR$/out/artifacts/statistics</output-path> 9 <root id="archive" name="statistics.war"> 10 <element id="directory" name="WEB-INF"> 11 <element id="directory" name="classes"> 12 <element id="module-output" name="Common" /> 13 <element id="module-output" name="Domain" /> 14 <element id="module-output" name="Persistence" /> 15 <element id="module-output" name="Service" /> 16 <element id="module-output" name="Web" /> 17 </element> 18 <element id="directory" name="lib"> 19 <element id="library" level="project" name="lib_spring" /> 20 <element id="library" level="project" name="lib_hibernate" /> 21 </element> 22 </element> 23 <element id="javaee-facet-resources" facet="Web/web/Web" /> 24 </root> 10 25 </artifact> 11 26 </component> -
ether_statistics/common/implementation/log4j.xml
r667 r684 23 23 24 24 <!-- library loggers --> 25 < logger name="oracle.jdbc" additivity="false">26 < level value="info"/>25 <!--<logger name="oracle.jdbc" additivity="false">--> 26 <!--<level value="info"/>--> 27 27 <!--<appender-ref ref="file"/>--> 28 28 <!--<appender-ref ref="console"/>--> 29 < /logger>29 <!--</logger>--> 30 30 31 < logger name="oracle.ons" additivity="false">32 < level value="debug"/>31 <!--<logger name="oracle.ons" additivity="false">--> 32 <!--<level value="debug"/>--> 33 33 <!--<appender-ref ref="file"/>--> 34 34 <!--<appender-ref ref="console"/>--> 35 < /logger>35 <!--</logger>--> 36 36 37 < logger name="org.hibernate">38 < level value="trace"/>37 <!--<logger name="org.hibernate">--> 38 <!--<level value="trace"/>--> 39 39 <!--<appender-ref ref="file"/>--> 40 40 <!--<appender-ref ref="consoleHibernate"/>--> 41 < /logger>41 <!--</logger>--> 42 42 43 < logger name="com.ether">44 < level value="trace"/>43 <!--<logger name="com.ether">--> 44 <!--<level value="trace"/>--> 45 45 <!--<appender-ref ref="file"/>--> 46 46 <!--<appender-ref ref="console"/>--> 47 < /logger>47 <!--</logger>--> 48 48 49 49 <!-- <logger name="org.hibernate.persister.entity" additivity="false">--> … … 65 65 <!-- </logger>--> 66 66 67 < logger name="net.sf.cglib" additivity="false">68 < level value="warn"/>67 <!--<logger name="net.sf.cglib" additivity="false">--> 68 <!--<level value="warn"/>--> 69 69 <!--<appender-ref ref="file"/>--> 70 70 <!--<appender-ref ref="console"/>--> 71 < /logger>71 <!--</logger>--> 72 72 73 73 <!-- root logger --> 74 < root>75 < level value="warn"/>74 <!--<root>--> 75 <!--<level value="warn"/>--> 76 76 <!--<appender-ref ref="console"/>--> 77 77 <!--<appender-ref ref="file"/>--> 78 < /root>78 <!--</root>--> 79 79 80 80 </log4j:configuration> -
ether_statistics/web/project/credits_en.jsp
r667 r684 11 11 Images used for this web site mostly belong to the CNRS and ETHER pictures library.<BR/> 12 12 They are properties to CNRS and ETHER. Any copies, complete or partial, can not be done without their consent. 13 <BR/><BR/>14 15 <div class="title2"> Others</div>16 Visualization tools : <a href="http://wijmo.com/">Wijmo</a>17 <BR/> (free download).18 13 </div> -
ether_statistics/web/project/credits_fr.jsp
r667 r684 11 11 Les images utilisées pour la réalisation de ce site web proviennent, <BR/>pour la plupart, de la photothÚque du CNRS et du fond de ETHER.<BR/> 12 12 Elles sont la propriété du CNRS et de ETHER. Toute copie, totale <BR/> ou partielle, ne peut se faire sans leur accord. 13 <BR/><BR/>14 15 <div class="title2"> Autres</div>16 Outils de visualisation : <a href="http://wijmo.com/">Wijmo</a>17 <BR/> (en téléchargement gratuit).18 13 </div> -
ether_statistics/web/project/statistics-script_sauv.jsp
r668 r684 108 108 specificClass:"containerStatistics", specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent"} ); 109 109 110 this. rightLoginSlide = new DragSlide( {id:"loginRight", parent:this.parent, width:"200", height:"25", top:"170px", left:"697px",110 this.loginSlide = new DragSlide( {id:"loginRight", parent:this.parent, width:"200", height:"25", top:"170px", left:"697px", 111 111 specificClass:"containerStatistics", specificTitleClass:"containerStatisticsTitle", specificContentClass:"containerStatisticsContent"} ); 112 112 }, … … 171 171 this.changeLeftMiddleSlide(); 172 172 this.changeLeftBottomSlide(); 173 this.displayVisit Evolution();173 this.displayVisit(); 174 174 }, 175 175 … … 214 214 // User 215 215 if( this.jSONUser.name ) 216 this. rightLoginSlide.setTitle( this.jSONUser.name );216 this.loginSlide.setTitle( this.jSONUser.name ); 217 217 else 218 this. rightLoginSlide.setTitle( '<spring:message code="label.unknown"/>' );218 this.loginSlide.setTitle( '<spring:message code="label.unknown"/>' ); 219 219 $( "#logout_button" ).css( "visibility", "visible" ); 220 220 … … 480 480 this.rightSlide.setTitle( '<spring:message code="label.actions"/>' ); 481 481 this.rightSlide.getDivContent().empty(); 482 new Button( {value:"<spring:message code="statistics.visit"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayVisit Evolution, this )} );482 new Button( {value:"<spring:message code="statistics.visit"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayVisit, this )} ); 483 483 new Button( {value:"<spring:message code="statistics.user.registered"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayRegisteredUserEvolution, this )} ); 484 484 new Button( {value:"<spring:message code="statistics.user.connected"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayConnectedUserEvolution, this )} ); 485 new Button( {value:"<spring:message code="statistics.data.download"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayDownload Evolution, this )} );485 new Button( {value:"<spring:message code="statistics.data.download"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayDownload, this )} ); 486 486 new Button( {value:"<spring:message code="statistics.map.distribution"/>", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayMapDistribution, this )} ); 487 new Button( {value:"AWSTATS", parent:this.rightSlide.getDivContent(), className: "positive action_button", onClick:jQuery.proxy( this.displayAwstatsStatistics, this )} ); 487 488 new Button( {value:"<spring:message code="label.print"/>", parent:this.rightSlide.getDivContent(), className: "blue export_button print-preview", onClick:jQuery.proxy( this.onClickPrint, this )} ); 488 489 }, … … 629 630 }, 630 631 631 displayVisit Evolution: function()632 displayVisit: function() 632 633 { 633 634 this.changeMiddleSlide( '<spring:message code="statistics.evolution.visit"/>', '<spring:message code="statistics.distribution.visit"/>' ); … … 644 645 }, 645 646 646 displayDownload Evolution: function()647 displayDownload: function() 647 648 { 648 649 this.changeMiddleSlide( '<spring:message code="statistics.evolution.download"/>', '<spring:message code="statistics.distribution.download"/>' ); … … 652 653 { 653 654 this.changeMiddleSlideForMap(); 655 }, 656 657 displayAwstatsStatistics: function() 658 { 659 660 // var url = 'http://www.pole-ether.fr/cgi-bin/awstats/awstats.pl?config=tapas'; 661 var url = "/statistics/project/credits_en.jsp"; 662 // var url = "http://localhost/cgi-bin/awstats/awstats.pl?config=megapoli"; 663 664 // var jqxhr = jQuery.get( url, function() 665 // { 666 // } ) 667 // .success( function( data ) 668 // { 669 // $( '#bob' ).html( data ); 670 // } ) 671 // .error( function( data ) 672 // { 673 // alert( "error" ); 674 // } ) 675 // .complete( function( data ) 676 // { 677 // } ); 678 679 $( "#divDialog" ).load( url ); 680 681 682 // var $dialog = $( '<div></div>' ) 683 // .html( "http://www.pole-ether.fr/cgi-bin/awstats/awstats.pl?config=tapas" ) 684 // .dialog( { 685 // autoOpen: false, 686 // title: "paf", 687 // height: 50, 688 // width: 400 689 // } ); 690 // $dialog.dialog( 'open' ); 691 692 // $( '<div>' ).dialog( { 693 // modal: true, 694 // open: function () 695 // { 696 // $( this ).load( 'http://www.google.fr' ); 697 // }, 698 // height: 400, 699 // width: 400, 700 // title: 'Dynamically Loaded Page' 701 // } ); 702 703 // $( "#divDialog" ).dialog( { 704 // height: 400, 705 // width: 500, 706 // modal: true 707 // } ); 708 // $( "#divDialog" ).dialog( "option", "title", "paf" ); 709 // $( "#divDialog" ).dialog( "option", "resizable", false ); 710 // $( "#divDialog" ).dialog( "option", "buttons", { 711 // "Close": function() 712 // { 713 // $( this ).dialog( "close" ); 714 // $( this ).dialog( "destroy" ); 715 // } 716 // } ); 717 // $( "#divDialog" ).load( "http://localhost:8080" ); 718 // $( "#divDialog" ).load( "project/credits_en.jsp" ); 719 720 // $( "#middle" ).load( 'http://www.google.fr' ); 721 // var $dialog = $( '<div></div>' ) 722 // .load( 'http://www.google.fr' ) 723 // .dialog( { 724 // autoOpen: true, 725 // title: "hop", 726 // height: 400, 727 // width: 750 728 // } ); 729 // $dialog.dialog( 'open' ); 730 731 // $( '#report' ).dialog( { 732 // autoOpen: true, 733 // bgiframe: true, 734 // resizable: true, 735 // modal: false, 736 // width: 500, 737 // title: 'Signaler un problÚme' 738 // } ); 739 // 740 // $( '#report' ).dialog( 'option', 'buttons', { 741 // 'Signaler': function() 742 // { 743 // $( this ).dialog( 'close' ); 744 // }, 745 // 'Fermer': function() 746 // { 747 // $( this ).dialog( 'close' ); 748 // } 749 // } ); 750 //// $( '#report' ).load( "http://www.pole-ether.fr/cgi-bin/awstats/awstats.pl?config=tapas" ).dialog( 'open' ); 751 // $( '#report' ).load( "http://www.google.fr" ).dialog( 'open' ); 752 753 // $.load( "http://www.pole-ether.fr/cgi-bin/awstats/awstats.pl?config=tapas" ).dialog( {modal:true} ); 754 // var printContent = new PrintContent(); 755 // 756 // printContent.addContent( $( "#title" ).clone() ); 757 // printContent.addContent( this.leftTopSlide.getDivContainer().clone().animate( {'marginLeft' : "+=80px"} ) ); 758 // printContent.addContent( this.leftMiddleSlide.getDivContainer().clone().animate( {'marginLeft' : "+=80px"} ) ); 759 // printContent.addContent( this.leftBottomSlide.getDivContainer().clone().animate( {'marginLeft' : "+=80px"} ) ); 760 // printContent.addContent( this.middleSlide.getDivContainer().clone().animate( {'marginLeft' : "+=120px"} ) ); 761 // printContent.displayPrintPreview(); 654 762 } 655 763 -
ether_statistics/web/project/statistics.jsp
r667 r684 15 15 <ether:htmlCss cssFile="button"/> 16 16 <%-- WIJMO --%> 17 < ether:htmlCss cssFile="Wijmo/rocket/jquery-wijmo"/>18 < ether:htmlCss cssFile="Wijmo/jquery.wijmo-complete.all.2.0.0.min"/>17 <%--<ether:htmlCss cssFile="Wijmo/rocket/jquery-wijmo"/>--%> 18 <%--<ether:htmlCss cssFile="Wijmo/jquery.wijmo-complete.all.2.0.0.min"/>--%> 19 19 20 20 <ether:htmlCss cssFile="ether"/> 21 21 <ether:htmlCss cssFile="statistics"/> 22 22 <ether:htmlCss cssFile="printContent"/> 23 24 <ether:htmlJs jsFile="library/jquery-1.4.2.min"/> 25 <ether:htmlJs jsFile="library/jquery.class"/> 26 <ether:htmlJs jsFile="library/jquery.protify-0.3"/> 23 27 24 28 <ether:htmlJs jsFile="library/jquery-1.8.2.min"/> … … 32 36 33 37 <%-- WIJMO --%> 34 < ether:htmlJs jsFile="Wijmo.2.2.2/Wijmo-Open/js/jquery.wijmo-open.all.2.2.2.min"/>35 < ether:htmlJs jsFile="Wijmo.2.2.2/Wijmo-Complete/js/jquery.wijmo-complete.all.2.2.2.min"/>38 <%--<ether:htmlJs jsFile="Wijmo.2.2.2/Wijmo-Open/js/jquery.wijmo-open.all.2.2.2.min"/>--%> 39 <%--<ether:htmlJs jsFile="Wijmo.2.2.2/Wijmo-Complete/js/jquery.wijmo-complete.all.2.2.2.min"/>--%> 36 40 37 41 <ether:htmlJsp jspFile="statistics-script"/> -
ether_statistics/web/resources/css/statistics.css
r667 r684 157 157 #copy { 158 158 position: absolute; 159 top: 497px;160 left: 8 12px;159 top: 513px; 160 left: 861px; 161 161 } 162 162 … … 175 175 #help { 176 176 position: absolute; 177 top: 2 47px;178 left: 375px;177 top: 255px; 178 left: 400px; 179 179 } 180 180 181 181 #credits { 182 182 position: absolute; 183 top: 5 24px;184 left: 695px;183 top: 543px; 184 left: 752px; 185 185 } 186 186 187 187 #mentions { 188 188 position: absolute; 189 top: 5 43px;190 left: 7 25px;189 top: 561px; 190 left: 779px; 191 191 } 192 192 … … 242 242 } 243 243 244 #login Right{244 #loginMiddle { 245 245 color: white; 246 246 } 247 247 248 #loginRight .containerStatisticsTitle { 248 #loginMiddle .containerStatisticsTitle { 249 text-align: center; 250 } 251 252 #awstats { 253 position: absolute; 254 } 255 256 #awstats .containerStatisticsTitle { 257 background: -moz-linear-gradient(#F5F5F5, #DFF4FF) repeat scroll 0 0 transparent; 258 background: -ms-linear-gradient(#F5F5F5, #DFF4FF) repeat scroll 0 0 transparent; /*For IE10*/ 259 background: -webkit-linear-gradient(#F5F5F5, #DFF4FF) repeat scroll 0 0 transparent; /*For IE10*/ 260 filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#F5F5F5', endColorstr = 'DFF4FF'); /*For IE7-8-9*/ 261 -moz-box-shadow: none; 262 -webkit-box-shadow: none; 263 box-shadow: none; 264 background-color: #F5F5F5; 265 border: 1px solid #336699; 266 color: #336699; 249 267 text-align: center; 250 268 } … … 285 303 .action_button { 286 304 width: 95%; 287 margin: 3px;305 margin: 2px; 288 306 } 289 307 290 308 .export_button { 291 309 float: right; 292 margin: 20px 6px 0 0;293 } 310 margin: 5px 6px 0 0; 311 } -
ether_statistics/web/resources/js/classesForJQuery/DragSlide.js
r663 r684 28 28 this.contentPageSlide = objectParameter.contentPageSlide ? objectParameter.contentPageSlide : false; 29 29 this.isIndexToChange = objectParameter.isIndexToChange ? objectParameter.isIndexToChange : false; 30 // By default, we activate the double click to enlarge or reduce the slide 31 this.activeDbClick = !objectParameter.activeDbClick; 30 32 31 33 this.divContainer = $( document.createElement( "div" ) ); … … 54 56 this.divContainer.resizable(); 55 57 // this.divContainer.dblclick(); 56 this.divTitle.dblclick( jQuery.proxy( this.onDbClickTitle, this ) ); 58 if( this.activeDbClick ) 59 this.divTitle.dblclick( jQuery.proxy( this.onDbClickTitle, this ) ); 57 60 this.divContainer.resize( jQuery.proxy( this.onResizeContainer, this ) ); 58 61 }, -
ether_statistics/web/src/messages_en.properties
r667 r684 18 18 label.print=Print 19 19 label.unknown=Unknown 20 label.awstats=Launch Awstats 20 21 21 22 statistics.online=Online since … … 31 32 statistics.duration.total=Total 32 33 statistics.duration.average=Average 34 statistics.domain=Domains / Countries 35 statistics.summary=Summary 36 statistics.monthly=Monthly history 37 statistics.daily=Days of month 38 statistics.daysofweek=Days of week 39 statistics.hours=Hours 40 statistics.visit.duration=Visits duration 33 41 34 42 statistics.evolution=Statistics evolution -
ether_statistics/web/src/messages_fr.properties
r667 r684 18 18 label.print=Imprimer 19 19 label.unknown=Inconnu 20 label.awstats=Lancer Awstats 20 21 21 22 statistics.online=En ligne depuis le … … 31 32 statistics.duration.total=Totale 32 33 statistics.duration.average=Moyenne 34 statistics.domain=Domaines / Pays 35 statistics.summary=Résumé 36 statistics.monthly=Historique mensuel 37 statistics.daily=Jours du mois 38 statistics.daysofweek=Jours de la semaine 39 statistics.hours=Heures 40 statistics.visit.duration=Durée des visites 41 33 42 34 43 statistics.evolution=Evolution des statistiques -
ether_statistics/web/src/statistics.properties
r667 r684 1 1 mail.host=mailhost.ipsl.jussieu.fr 2 2 mail.webmaster=vmipsl@ipsl.jussieu.fr 3 # LOCAL 4 #url.pages="/statistics/project/mentions_en.jsp" 5 #url.domains="/statistics/project/credits_en.jsp" 6 #url.downloads="/statistics/project/credits_fr.jsp" 7 8 # PROD 9 url.summary="/cgi-bin/awstats/awstats.pl?output=displaysummary&config=" 10 url.monthly="/cgi-bin/awstats/awstats.pl?output=displaymonthly&config=" 11 url.daily="/cgi-bin/awstats/awstats.pl?output=displaydaily&config=" 12 url.daysofweek="/cgi-bin/awstats/awstats.pl?output=displaydaysofweek&config=" 13 url.hours="/cgi-bin/awstats/awstats.pl?output=displayhours&config=" 14 url.sessions="/cgi-bin/awstats/awstats.pl?output=displaysessions&config=" 15 url.visited.pages="/cgi-bin/awstats/awstats.pl?output=urldetail&config=" 16 url.domains="/cgi-bin/awstats/awstats.pl?output=alldomains&config=" 17 url.downloads="/cgi-bin/awstats/awstats.pl?output=downloads&config=" 18
Note: See TracChangeset
for help on using the changeset viewer.