Changeset 339 for ether_megapoli/trunk
- Timestamp:
- 01/11/12 12:42:40 (12 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 6 added
- 2 deleted
- 8 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/service/test/com/ether/OtherTest.java
r279 r339 7 7 import sun.misc.BASE64Encoder; 8 8 9 import java.io.FileInputStream; 9 10 import java.io.IOException; 10 11 import java.security.DigestException; … … 18 19 import java.util.HashSet; 19 20 import java.util.List; 21 import java.util.Properties; 20 22 import java.util.Set; 21 23 import java.util.TimeZone; … … 207 209 } 208 210 } 211 212 @Test 213 public void testProperties() 214 { 215 try 216 { 217 final Properties prop = new Properties(); 218 prop.load( new FileInputStream( "/home_local/bob.properties" ) ); 219 final String path = prop.getProperty( "pif" ); 220 final FileInputStream fileInputStream = new FileInputStream( path + "/anytime.css" ); 221 final Integer fileSize = fileInputStream.read(); 222 Assert.assertEquals( fileSize, (Integer) 47 ); 223 } 224 catch( IOException e ) 225 { 226 e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. 227 } 228 } 229 209 230 } -
ether_megapoli/trunk/web/data/upload.jsp
r281 r339 55 55 <nested:define id="fichierMetadonnee" property="fichierMeta"/> 56 56 57 <div id="level2" class="level2 ">57 <div id="level2" class="level2 level2_more"> 58 58 <html:form action="/ConfirmDeletion"> 59 59 <html:img page="/resources/images/utils/folder.png" alt="folder"/> <nested:write property="nomJeu"/> 60 60 <logic:equal name="SES_USER" property="roles" scope="session" value="<%=UserRole.COORDINATOR.name()%>"> 61 61 <html:hidden value="${cheminJeu}" property="path"/> 62 <html:image page="/resources/images/utils/delete.png" alt="delete" titleKey="data.upload.metadata.deleteJeu"/> 62 <%--<html:image page="/resources/images/utils/delete.png" alt="delete" titleKey="data.upload.metadata.deleteJeu"/>--%> 63 <input type="image" src="resources/images/utils/trash.png" width="20px" height="18px" alt="delete" title="<bean:message key='data.upload.metadata.deleteJeu'/>"/></input> 63 64 </logic:equal> 64 65 </html:form> -
ether_megapoli/trunk/web/resources/css/megapoli.css
r318 r339 164 164 165 165 .containerErrors, #errors { 166 background: url("images/ui-bg_glass_95_fef1ec_1x400.png") repeat-x scroll 50% 50%#FEF1EC;166 background: #FEF1EC; 167 167 -moz-border-radius: 4px 4px 4px 4px; 168 168 -webkit-border-radius: 4px 4px 4px 4px; … … 270 270 271 271 /*#hideSlide {*/ 272 273 274 275 272 /*background-image: url("../images/utils/toggle_up_dark.png");*/ 273 /*height: 13px;*/ 274 /*width: 13px;*/ 275 /*margin-top: -10px;*/ 276 276 /*}*/ 277 277 … … 396 396 } 397 397 398 .level2_more { 399 padding-bottom: 16px; 400 } 401 398 402 .elementExtract { 399 403 position: relative; -
ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css
r297 r339 92 92 color: #04155D; 93 93 text-align: center; 94 font-size: 13px; 94 95 } 95 96 -
ether_megapoli/trunk/web/resources/js/classesForJQuery/LoginButton.js
r316 r339 128 128 var divImgLogout = $( document.createElement( "div" ) ); 129 129 divImgLogout.addClass( "containerImgLogout" ); 130 divImgLogout.append( "<img src='resources/images/utils/logout.png' width='15px' height='15px />" );130 divImgLogout.append( "<img src='resources/images/utils/logout.png' width='15px' height='15px'/>" ); 131 131 divImgLogout.bind( "click", jQuery.proxy( this.onClickLogout, this ) ); 132 132 loginMiddle.append( divImgLogout ); -
ether_megapoli/trunk/web/resources/jsp/megapoliHead.jsp
r306 r339 76 76 77 77 var liExtract = $( document.createElement( "li" ) ); 78 var aExtract = $( document.createElement( "a" ) ); 79 aExtract.attr( {onclick:'javascript:neededLogin("/DataAccess.do")'} ); 80 aExtract.html( "<span>" + templateTexts["data.access.extract.short"] + "</span>" ); 81 liExtract.append( aExtract ); 78 liExtract.append('<a onclick=\'javascript:neededLogin("/DataAccess.do")\'><span>' + templateTexts["data.access.extract.short"] + '</span></a>'); 82 79 ulData.append( liExtract ); 83 80 var liDownload = $( document.createElement( "li" ) ); -
ether_megapoli/trunk/web/src/json/json-context.xml
r154 r339 7 7 <property name="mapping"> 8 8 <map> 9 <entry key="com.medias.database.objects.Plateforme" value-ref="plateformJsonSerializer"/> 10 <entry key="com.medias.database.objects.Parametre" value-ref="parameterJsonSerializer"/> 9 <entry key="com.medias.database.objects.Plateforme" value-ref="plateformJsonSerializer"/> 10 <entry key="com.medias.database.objects.Parametre" value-ref="parameterJsonSerializer"/> 11 <entry key="com.ether.user.User" value-ref="userJsonSerializer"/> 11 12 </map> 12 13 </property> … … 15 16 <bean id="plateformJsonSerializer" class="json.serializers.PlateformJsonSerializer"/> 16 17 <bean id="parameterJsonSerializer" class="json.serializers.ParameterJsonSerializer"/> 18 <bean id="userJsonSerializer" class="json.serializers.UserJsonSerializer"/> 19 17 20 </beans> -
ether_megapoli/trunk/web/src/json/serializers/UserJsonSerializer.java
r297 r339 1 1 package json.serializers; 2 2 3 import com. medias.database.objects.Parametre;3 import com.ether.user.User; 4 4 import net.sf.json.JSONObject; 5 5 import net.sf.json.JsonConfig; 6 6 7 public class ParameterJsonSerializer8 extends AbstractJsonSerializer< Parametre>7 public class UserJsonSerializer 8 extends AbstractJsonSerializer<User> 9 9 { 10 public JSONObject process( final Parametre parameter, final JsonConfig jsonConfig )10 public JSONObject process( final User user, final JsonConfig jsonConfig ) 11 11 { 12 12 final JSONObject result = new JSONObject(); 13 13 14 serialize( result, "id", parameter.getParametreId(), jsonConfig ); 15 serialize( result, "name", parameter.getParametreNom(), jsonConfig ); 16 serialize( result, "code", parameter.getParametreCode(), jsonConfig ); 17 if( null != parameter.getCategorieParam() ) 18 serialize( result, "categoryName", parameter.getCategorieParam().getCategorieParamNom(), jsonConfig ); 14 serialize( result, "id", user.getId(), jsonConfig ); 15 serialize( result, "lastName", user.getLastName(), jsonConfig ); 16 serialize( result, "firstName", user.getFirstName(), jsonConfig ); 17 serialize( result, "accessToBO", user.isAccessToBO(), jsonConfig ); 18 serialize( result, "creationDate", user.getCreationDate(), jsonConfig ); 19 serialize( result, "email", user.getEmail(), jsonConfig ); 20 serialize( result, "role", user.getRole(), jsonConfig ); 21 serialize( result, "state", user.getState(), jsonConfig ); 19 22 20 23 return result; -
ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp
r306 r339 144 144 handleDownload: function( result ) 145 145 { 146 var stateResult = result.responseText.evalJSON().result; 147 148 var downloadWindow = new Window( {className: "dialog", zIndex: 100, resizable: true, draggable:true, wiredDrag: true, showEffect:Effect.BlindDown, hideEffect: Effect.SwitchOff } ); 149 downloadWindow.setTitle( interfaceTexts["data.access.extract3"] ); 150 if( stateResult == "ok" ) 151 { 152 downloadWindow.getContent().innerHTML = '<div class="textExamplesTD">' + interfaceTexts["data.access.extract.process.short"] + '</div>'; 153 downloadWindow.setSize( 350, 50 ); 154 } 155 else 156 { 157 downloadWindow.getContent().innerHTML = '<div class="textExamplesTD">' + interfaceTexts["data.access.extract.process.error"] + '</div>'; 158 downloadWindow.setSize( 350, 60 ); 159 } 160 downloadWindow.show(); 146 var stateResult = jQuery.parseJSON( result ).result; 147 148 if( "ok" == stateResult ) 149 { 150 var $dialog = $( '<div></div>' ) 151 .html( '<div class="textExamplesTD">' + interfaceTexts["data.access.extract.process.short"] + '</div>' ) 152 .dialog( { 153 autoOpen: false, 154 title: interfaceTexts["data.access.extract3"], 155 minHeight: 50, 156 minWidth: 350 157 } ); 158 $dialog.dialog( 'open' ); 159 } 160 else 161 { 162 var $dialog = $( '<div></div>' ) 163 .html( '<div class="textExamplesTD">' + interfaceTexts["data.access.extract.process.error"] + '</div>' ) 164 .dialog( { 165 autoOpen: false, 166 title: interfaceTexts["data.access.extract3"], 167 minHeight: 60, 168 minWidth: 350 169 } ); 170 $dialog.dialog( 'open' ); 171 } 161 172 }, 162 173 … … 461 472 function onClickHelp() 462 473 { 463 var helpWindow = new Window( {className: "dialog", zIndex: 100, resizable: true, draggable:true, wiredDrag: true, showEffect:Effect.BlindDown, hideEffect: Effect.SwitchOff } ); 464 helpWindow.setTitle( interfaceTexts["visualization.parameter.buttons.help"] ); 465 helpWindow.getContent().innerHTML = '<div class="textExamplesTD">' + interfaceTexts["visualization.parameter.buttons.help.text"] + '</div>'; 466 helpWindow.setSize( 350, 100 ); 467 helpWindow.show(); 474 var $dialog = $( '<div></div>' ) 475 .html( '<div class="textExamplesTD">' + interfaceTexts["visualization.parameter.buttons.help.text"] + '</div>' ) 476 .dialog( { 477 autoOpen: false, 478 title: interfaceTexts["visualization.parameter.buttons.help"], 479 minHeight: 100, 480 minWidth: 350 481 } ); 482 $dialog.dialog( 'open' ); 468 483 } 469 484
Note: See TracChangeset
for help on using the changeset viewer.